aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/defxx.c2
-rw-r--r--drivers/net/rrunner.c1
-rw-r--r--drivers/net/skfp/skfddi.c1
-rw-r--r--drivers/s390/net/lcs.c1
-rw-r--r--net/802/fddi.c1
-rw-r--r--net/802/hippi.c8
6 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 07d2731c1aa8..8d29fae1c71c 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -3096,8 +3096,6 @@ static void dfx_rcv_queue_process(
3096 3096
3097 skb_reserve(skb,3); /* adjust data field so that it points to FC byte */ 3097 skb_reserve(skb,3); /* adjust data field so that it points to FC byte */
3098 skb_put(skb, pkt_len); /* pass up packet length, NOT including CRC */ 3098 skb_put(skb, pkt_len); /* pass up packet length, NOT including CRC */
3099 skb->dev = bp->dev; /* pass up device pointer */
3100
3101 skb->protocol = fddi_type_trans(skb, bp->dev); 3099 skb->protocol = fddi_type_trans(skb, bp->dev);
3102 bp->rcv_total_bytes += skb->len; 3100 bp->rcv_total_bytes += skb->len;
3103 netif_rx(skb); 3101 netif_rx(skb);
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index d81536f90df6..3a4fce384504 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -1029,7 +1029,6 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
1029 goto defer; 1029 goto defer;
1030 } 1030 }
1031 } 1031 }
1032 skb->dev = dev;
1033 skb->protocol = hippi_type_trans(skb, dev); 1032 skb->protocol = hippi_type_trans(skb, dev);
1034 1033
1035 netif_rx(skb); /* send it up */ 1034 netif_rx(skb); /* send it up */
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 9733a11c6146..064e7c21c01d 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -1680,7 +1680,6 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,
1680 rxd->rxd_os.skb = NULL; 1680 rxd->rxd_os.skb = NULL;
1681 skb_trim(skb, len); 1681 skb_trim(skb, len);
1682 skb->protocol = fddi_type_trans(skb, bp->dev); 1682 skb->protocol = fddi_type_trans(skb, bp->dev);
1683 skb->dev = bp->dev; /* pass up device pointer */
1684 1683
1685 netif_rx(skb); 1684 netif_rx(skb);
1686 bp->dev->last_rx = jiffies; 1685 bp->dev->last_rx = jiffies;
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index ecca1046714e..1c23e187a3ba 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1784,7 +1784,6 @@ lcs_get_skb(struct lcs_card *card, char *skb_data, unsigned int skb_len)
1784 card->stats.rx_dropped++; 1784 card->stats.rx_dropped++;
1785 return; 1785 return;
1786 } 1786 }
1787 skb->dev = card->dev;
1788 memcpy(skb_put(skb, skb_len), skb_data, skb_len); 1787 memcpy(skb_put(skb, skb_len), skb_data, skb_len);
1789 skb->protocol = card->lan_type_trans(skb, card->dev); 1788 skb->protocol = card->lan_type_trans(skb, card->dev);
1790 card->stats.rx_bytes += skb_len; 1789 card->stats.rx_bytes += skb_len;
diff --git a/net/802/fddi.c b/net/802/fddi.c
index 8c86216b1c85..f8a0c9f6fec9 100644
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -130,6 +130,7 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
130 * to start of packet data. Assume 802.2 SNAP frames for now. 130 * to start of packet data. Assume 802.2 SNAP frames for now.
131 */ 131 */
132 132
133 skb->dev = dev;
133 skb->mac.raw = skb->data; /* point to frame control (FC) */ 134 skb->mac.raw = skb->data; /* point to frame control (FC) */
134 135
135 if(fddi->hdr.llc_8022_1.dsap==0xe0) 136 if(fddi->hdr.llc_8022_1.dsap==0xe0)
diff --git a/net/802/hippi.c b/net/802/hippi.c
index 35dd938cff95..138302c14ee6 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -126,14 +126,14 @@ __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
126{ 126{
127 struct hippi_hdr *hip; 127 struct hippi_hdr *hip;
128 128
129 hip = (struct hippi_hdr *) skb->data;
130
131 /* 129 /*
132 * This is actually wrong ... question is if we really should 130 * This is actually wrong ... question is if we really should
133 * set the raw address here. 131 * set the raw address here.
134 */ 132 */
135 skb->mac.raw = skb->data; 133 skb->dev = dev;
136 skb_pull(skb, HIPPI_HLEN); 134 skb->mac.raw = skb->data;
135 hip = (struct hippi_hdr *)skb->mac.raw;
136 skb_pull(skb, HIPPI_HLEN);
137 137
138 /* 138 /*
139 * No fancy promisc stuff here now. 139 * No fancy promisc stuff here now.