diff options
author | Grant Likely <grant.likely@linaro.org> | 2014-03-04 03:44:10 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-03-04 03:44:10 -0500 |
commit | dab2310d9d90eded48625c5382c6a60389bf8ca9 (patch) | |
tree | 9327cc815d69dec23aebf03407e3fa82b6d2fbaa /drivers/net/wan/dlci.c | |
parent | a3dbeb5b45af5b6113385db89fce2a8279278e8b (diff) | |
parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) |
Merge tag 'v3.14-rc5' into HEAD
Linux 3.14-rc5
Diffstat (limited to 'drivers/net/wan/dlci.c')
-rw-r--r-- | drivers/net/wan/dlci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c index 0d1c7592efa0..19f7cb2cdef3 100644 --- a/drivers/net/wan/dlci.c +++ b/drivers/net/wan/dlci.c | |||
@@ -71,12 +71,9 @@ static int dlci_header(struct sk_buff *skb, struct net_device *dev, | |||
71 | const void *saddr, unsigned len) | 71 | const void *saddr, unsigned len) |
72 | { | 72 | { |
73 | struct frhdr hdr; | 73 | struct frhdr hdr; |
74 | struct dlci_local *dlp; | ||
75 | unsigned int hlen; | 74 | unsigned int hlen; |
76 | char *dest; | 75 | char *dest; |
77 | 76 | ||
78 | dlp = netdev_priv(dev); | ||
79 | |||
80 | hdr.control = FRAD_I_UI; | 77 | hdr.control = FRAD_I_UI; |
81 | switch (type) | 78 | switch (type) |
82 | { | 79 | { |
@@ -107,11 +104,9 @@ static int dlci_header(struct sk_buff *skb, struct net_device *dev, | |||
107 | 104 | ||
108 | static void dlci_receive(struct sk_buff *skb, struct net_device *dev) | 105 | static void dlci_receive(struct sk_buff *skb, struct net_device *dev) |
109 | { | 106 | { |
110 | struct dlci_local *dlp; | ||
111 | struct frhdr *hdr; | 107 | struct frhdr *hdr; |
112 | int process, header; | 108 | int process, header; |
113 | 109 | ||
114 | dlp = netdev_priv(dev); | ||
115 | if (!pskb_may_pull(skb, sizeof(*hdr))) { | 110 | if (!pskb_may_pull(skb, sizeof(*hdr))) { |
116 | netdev_notice(dev, "invalid data no header\n"); | 111 | netdev_notice(dev, "invalid data no header\n"); |
117 | dev->stats.rx_errors++; | 112 | dev->stats.rx_errors++; |