projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
slip.c
diff --git
a/drivers/net/slip.c
b/drivers/net/slip.c
index 2f4b1de7a2b403dba05d2decc326ae4a9d83ad40..335b7cc80ebaf3aaf430af776f08d716dd215dbf 100644
(file)
--- a/
drivers/net/slip.c
+++ b/
drivers/net/slip.c
@@
-363,7
+363,7
@@
sl_bump(struct slip *sl)
}
skb->dev = sl->dev;
memcpy(skb_put(skb,count), sl->rbuff, count);
}
skb->dev = sl->dev;
memcpy(skb_put(skb,count), sl->rbuff, count);
- skb
->mac.raw=skb->data
;
+ skb
_reset_mac_header(skb)
;
skb->protocol=htons(ETH_P_IP);
netif_rx(skb);
sl->dev->last_rx = jiffies;
skb->protocol=htons(ETH_P_IP);
netif_rx(skb);
sl->dev->last_rx = jiffies;
@@
-639,8
+639,6
@@
static void sl_setup(struct net_device *dev)
dev->addr_len = 0;
dev->tx_queue_len = 10;
dev->addr_len = 0;
dev->tx_queue_len = 10;
- SET_MODULE_OWNER(dev);
-
/* New-style flags. */
dev->flags = IFF_NOARP|IFF_POINTOPOINT|IFF_MULTICAST;
}
/* New-style flags. */
dev->flags = IFF_NOARP|IFF_POINTOPOINT|IFF_MULTICAST;
}
@@
-957,7
+955,7
@@
slip_close(struct tty_struct *tty)
* STANDARD SLIP ENCAPSULATION *
************************************************************************/
* STANDARD SLIP ENCAPSULATION *
************************************************************************/
-int
+
static
int
slip_esc(unsigned char *s, unsigned char *d, int len)
{
unsigned char *ptr = d;
slip_esc(unsigned char *s, unsigned char *d, int len)
{
unsigned char *ptr = d;