mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
1a98c69af1
561 changed files with 5001 additions and 3110 deletions
|
|
@ -1489,8 +1489,6 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev,
|
|||
goto drop;
|
||||
|
||||
/* Queue packet (standard) */
|
||||
skb->sk = sock;
|
||||
|
||||
if (sock_queue_rcv_skb(sock, skb) < 0)
|
||||
goto drop;
|
||||
|
||||
|
|
@ -1644,7 +1642,6 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
|
|||
if (!skb)
|
||||
goto out;
|
||||
|
||||
skb->sk = sk;
|
||||
skb_reserve(skb, ddp_dl->header_length);
|
||||
skb_reserve(skb, dev->hard_header_len);
|
||||
skb->dev = dev;
|
||||
|
|
|
|||
Loading…
Reference in a new issue