aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/hdlc_fr.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wan/hdlc_fr.c')
-rw-r--r--drivers/net/wan/hdlc_fr.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 51296c2b8b89..2bd609c27068 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -956,7 +956,7 @@ static int fr_rx(struct sk_buff *skb)
956 956
957 957
958 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) { 958 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
959 dev_to_desc(frad)->stats.rx_dropped++; 959 dev_to_hdlc(frad)->stats.rx_dropped++;
960 return NET_RX_DROP; 960 return NET_RX_DROP;
961 } 961 }
962 962
@@ -1017,7 +1017,7 @@ static int fr_rx(struct sk_buff *skb)
1017 } 1017 }
1018 1018
1019 rx_error: 1019 rx_error:
1020 dev_to_desc(frad)->stats.rx_errors++; /* Mark error */ 1020 dev_to_hdlc(frad)->stats.rx_errors++; /* Mark error */
1021 dev_kfree_skb_any(skb); 1021 dev_kfree_skb_any(skb);
1022 return NET_RX_DROP; 1022 return NET_RX_DROP;
1023} 1023}
@@ -1217,6 +1217,7 @@ static struct hdlc_proto proto = {
1217 .stop = fr_stop, 1217 .stop = fr_stop,
1218 .detach = fr_destroy, 1218 .detach = fr_destroy,
1219 .ioctl = fr_ioctl, 1219 .ioctl = fr_ioctl,
1220 .netif_rx = fr_rx,
1220 .module = THIS_MODULE, 1221 .module = THIS_MODULE,
1221}; 1222};
1222 1223
@@ -1275,7 +1276,7 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
1275 return result; 1276 return result;
1276 1277
1277 if (dev_to_hdlc(dev)->proto != &proto) { /* Different proto */ 1278 if (dev_to_hdlc(dev)->proto != &proto) { /* Different proto */
1278 result = attach_hdlc_protocol(dev, &proto, fr_rx, 1279 result = attach_hdlc_protocol(dev, &proto,
1279 sizeof(struct frad_state)); 1280 sizeof(struct frad_state));
1280 if (result) 1281 if (result)
1281 return result; 1282 return result;