mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
c4c5551df1
598 changed files with 5366 additions and 2963 deletions
|
|
@ -2881,6 +2881,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
|
|||
goto out_free;
|
||||
} else if (reserve) {
|
||||
skb_reserve(skb, -reserve);
|
||||
if (len < reserve)
|
||||
skb_reset_network_header(skb);
|
||||
}
|
||||
|
||||
/* Returns -EFAULT on error */
|
||||
|
|
|
|||
Loading…
Reference in a new issue