patch-2.4.0-test12 linux/drivers/net/pppoe.c
Next file: linux/drivers/net/rclanmtl.c
Previous file: linux/drivers/net/ppp_generic.c
Back to the patch index
Back to the overall index
- Lines: 23
- Date:
Mon Dec 11 12:37:03 2000
- Orig file:
v2.4.0-test11/linux/drivers/net/pppoe.c
- Orig date:
Sun Nov 19 18:44:11 2000
diff -u --recursive --new-file v2.4.0-test11/linux/drivers/net/pppoe.c linux/drivers/net/pppoe.c
@@ -785,8 +785,7 @@
skb_reserve(skb, dev->hard_header_len);
skb->nh.raw = skb->data;
- skb->rx_dev = skb->dev = dev;
- dev_hold(skb->rx_dev);
+ skb->dev = dev;
skb->priority = sk->priority;
skb->protocol = __constant_htons(ETH_P_PPP_SES);
@@ -869,11 +868,7 @@
skb->nh.raw = skb->data;
- /* Change device of skb, update reference counts */
- if(skb->rx_dev)
- dev_put(skb->rx_dev);
- skb->rx_dev = skb->dev = dev;
- dev_hold(skb->rx_dev);
+ skb->dev = dev;
dev->hard_header(skb, dev, ETH_P_PPP_SES,
sk->protinfo.pppox->pppoe_pa.remote,
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)