diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
| commit | 1d6ae775d7a948c9575658eb41184fd2e506c0df (patch) | |
| tree | 8128a28e89d82f13bb8e3a2160382240c66e2816 /drivers/isdn/i4l/isdn_ppp.c | |
| parent | 739cdbf1d8f0739b80035b80d69d871e33749b86 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/isdn/i4l/isdn_ppp.c')
| -rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 260a323a96d3..d97a9be5469c 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
| @@ -1177,7 +1177,6 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff | |||
| 1177 | mlp->huptimer = 0; | 1177 | mlp->huptimer = 0; |
| 1178 | #endif /* CONFIG_IPPP_FILTER */ | 1178 | #endif /* CONFIG_IPPP_FILTER */ |
| 1179 | skb->dev = dev; | 1179 | skb->dev = dev; |
| 1180 | skb->input_dev = dev; | ||
| 1181 | skb->mac.raw = skb->data; | 1180 | skb->mac.raw = skb->data; |
| 1182 | netif_rx(skb); | 1181 | netif_rx(skb); |
| 1183 | /* net_dev->local->stats.rx_packets++; done in isdn_net.c */ | 1182 | /* net_dev->local->stats.rx_packets++; done in isdn_net.c */ |