Commit 505c602f authored by Dave Jones's avatar Dave Jones Committed by Jeff Garzik

[netdrvr] Add missing WAN driver assignments to dev->last_rx for each RX packet

parent d0d43048
...@@ -186,6 +186,7 @@ static int lapbeth_data_indication(void *token, struct sk_buff *skb) ...@@ -186,6 +186,7 @@ static int lapbeth_data_indication(void *token, struct sk_buff *skb)
skb->mac.raw = skb->data; skb->mac.raw = skb->data;
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
skb->dev->last_rx = jiffies;
return netif_rx(skb); return netif_rx(skb);
} }
...@@ -283,6 +284,7 @@ static void lapbeth_connected(void *token, int reason) ...@@ -283,6 +284,7 @@ static void lapbeth_connected(void *token, int reason)
skb->mac.raw = skb->data; skb->mac.raw = skb->data;
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
skb->dev->last_rx = jiffies;
netif_rx(skb); netif_rx(skb);
} }
...@@ -305,6 +307,7 @@ static void lapbeth_disconnected(void *token, int reason) ...@@ -305,6 +307,7 @@ static void lapbeth_disconnected(void *token, int reason)
skb->mac.raw = skb->data; skb->mac.raw = skb->data;
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
skb->dev->last_rx = jiffies;
netif_rx(skb); netif_rx(skb);
} }
......
...@@ -253,6 +253,7 @@ void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/ ...@@ -253,6 +253,7 @@ void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/
case LMC_PPP: case LMC_PPP:
case LMC_NET: case LMC_NET:
default: default:
skb->dev->last_rx = jiffies;
netif_rx(skb); netif_rx(skb);
break; break;
case LMC_RAW: case LMC_RAW:
......
...@@ -2219,6 +2219,7 @@ static void rx_intr (sdla_t* card) ...@@ -2219,6 +2219,7 @@ static void rx_intr (sdla_t* card)
skb->dev = dev; skb->dev = dev;
skb->mac.raw = skb->data; skb->mac.raw = skb->data;
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies;
} }
rx_exit: rx_exit:
...@@ -3276,6 +3277,7 @@ static int process_udp_mgmt_pkt(sdla_t* card, netdevice_t* dev, ...@@ -3276,6 +3277,7 @@ static int process_udp_mgmt_pkt(sdla_t* card, netdevice_t* dev,
new_skb->mac.raw = new_skb->data; new_skb->mac.raw = new_skb->data;
netif_rx(new_skb); netif_rx(new_skb);
dev->last_rx = jiffies;
} else { } else {
printk(KERN_INFO "%s: no socket buffers available!\n", printk(KERN_INFO "%s: no socket buffers available!\n",
......
...@@ -2352,6 +2352,7 @@ static void rx_intr (sdla_t* card) ...@@ -2352,6 +2352,7 @@ static void rx_intr (sdla_t* card)
/* Send a packed up the IP stack */ /* Send a packed up the IP stack */
skb->dev->last_rx = jiffies;
netif_rx(skb); netif_rx(skb);
++chan->drvstats_rx_intr.rx_intr_bfr_passed_to_stack; ++chan->drvstats_rx_intr.rx_intr_bfr_passed_to_stack;
++chan->ifstats.rx_packets; ++chan->ifstats.rx_packets;
......
...@@ -1897,6 +1897,7 @@ static void rx_intr(sdla_t *card) ...@@ -1897,6 +1897,7 @@ static void rx_intr(sdla_t *card)
#endif #endif
++ppp_priv_area->rx_intr_stat.rx_intr_bfr_passed_to_stack; ++ppp_priv_area->rx_intr_stat.rx_intr_bfr_passed_to_stack;
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies;
} }
} else { } else {
...@@ -2451,7 +2452,7 @@ static int config508(netdevice_t *dev, sdla_t *card) ...@@ -2451,7 +2452,7 @@ static int config508(netdevice_t *dev, sdla_t *card)
#endif #endif
default: default:
printk(KERN_INFO "%s: ERROR: Unsuported PPP Mode Selected\n", printk(KERN_INFO "%s: ERROR: Unsupported PPP Mode Selected\n",
card->devname); card->devname);
printk(KERN_INFO "%s: PPP IP Modes: STATIC, PEER or HOST\n", printk(KERN_INFO "%s: PPP IP Modes: STATIC, PEER or HOST\n",
card->devname); card->devname);
...@@ -2943,6 +2944,7 @@ static void process_udp_mgmt_pkt(sdla_t *card, netdevice_t *dev, ...@@ -2943,6 +2944,7 @@ static void process_udp_mgmt_pkt(sdla_t *card, netdevice_t *dev,
new_skb->dev = dev; new_skb->dev = dev;
new_skb->mac.raw = new_skb->data; new_skb->mac.raw = new_skb->data;
netif_rx(new_skb); netif_rx(new_skb);
dev->last_rx = jiffies;
} else { } else {
......
...@@ -276,6 +276,7 @@ invalid: if (sp->pp_flags & PP_DEBUG) ...@@ -276,6 +276,7 @@ invalid: if (sp->pp_flags & PP_DEBUG)
printk(KERN_DEBUG "Yow an IP frame.\n"); printk(KERN_DEBUG "Yow an IP frame.\n");
skb->protocol=htons(ETH_P_IP); skb->protocol=htons(ETH_P_IP);
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies;
return; return;
} }
break; break;
...@@ -285,6 +286,7 @@ invalid: if (sp->pp_flags & PP_DEBUG) ...@@ -285,6 +286,7 @@ invalid: if (sp->pp_flags & PP_DEBUG)
if (sp->lcp.state == LCP_STATE_OPENED) { if (sp->lcp.state == LCP_STATE_OPENED) {
skb->protocol=htons(ETH_P_IPX); skb->protocol=htons(ETH_P_IPX);
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies;
return; return;
} }
break; break;
...@@ -312,12 +314,14 @@ invalid: if (sp->pp_flags & PP_DEBUG) ...@@ -312,12 +314,14 @@ invalid: if (sp->pp_flags & PP_DEBUG)
case ETH_P_IP: case ETH_P_IP:
skb->protocol=htons(ETH_P_IP); skb->protocol=htons(ETH_P_IP);
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies;
return; return;
#endif #endif
#ifdef CONFIG_IPX #ifdef CONFIG_IPX
case ETH_P_IPX: case ETH_P_IPX:
skb->protocol=htons(ETH_P_IPX); skb->protocol=htons(ETH_P_IPX);
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies;
return; return;
#endif #endif
} }
......
...@@ -1572,6 +1572,7 @@ static void rx_intr (sdla_t* card) ...@@ -1572,6 +1572,7 @@ static void rx_intr (sdla_t* card)
skb->dev = dev; skb->dev = dev;
skb->mac.raw = skb->data; skb->mac.raw = skb->data;
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies;
} }
rx_exit: rx_exit:
...@@ -2175,6 +2176,7 @@ static int process_udp_mgmt_pkt(sdla_t* card, netdevice_t* dev, ...@@ -2175,6 +2176,7 @@ static int process_udp_mgmt_pkt(sdla_t* card, netdevice_t* dev,
new_skb->mac.raw = new_skb->data; new_skb->mac.raw = new_skb->data;
netif_rx(new_skb); netif_rx(new_skb);
dev->last_rx = jiffies;
} else { } else {
printk(KERN_INFO "%s: no socket buffers available!\n", printk(KERN_INFO "%s: no socket buffers available!\n",
...@@ -2470,6 +2472,7 @@ static void send_ppp_term_request (netdevice_t *dev) ...@@ -2470,6 +2472,7 @@ static void send_ppp_term_request (netdevice_t *dev)
new_skb->mac.raw = new_skb->data; new_skb->mac.raw = new_skb->data;
netif_rx(new_skb); netif_rx(new_skb);
dev->last_rx = jiffies;
} }
} }
......
...@@ -250,6 +250,7 @@ static void x25_asy_bump(struct x25_asy *sl) ...@@ -250,6 +250,7 @@ static void x25_asy_bump(struct x25_asy *sl)
else else
{ {
netif_rx(skb); netif_rx(skb);
sl->dev->last_rx = jiffies;
sl->rx_packets++; sl->rx_packets++;
} }
} }
...@@ -397,6 +398,7 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -397,6 +398,7 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)
static int x25_asy_data_indication(void *token, struct sk_buff *skb) static int x25_asy_data_indication(void *token, struct sk_buff *skb)
{ {
skb->dev->last_rx = jiffies;
return netif_rx(skb); return netif_rx(skb);
} }
...@@ -449,6 +451,7 @@ static void x25_asy_connected(void *token, int reason) ...@@ -449,6 +451,7 @@ static void x25_asy_connected(void *token, int reason)
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
netif_rx(skb); netif_rx(skb);
sl->dev->last_rx = jiffies;
} }
static void x25_asy_disconnected(void *token, int reason) static void x25_asy_disconnected(void *token, int reason)
...@@ -471,6 +474,7 @@ static void x25_asy_disconnected(void *token, int reason) ...@@ -471,6 +474,7 @@ static void x25_asy_disconnected(void *token, int reason)
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
netif_rx(skb); netif_rx(skb);
sl->dev->last_rx = jiffies;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment