diff options
| author | David S. Miller <davem@davemloft.net> | 2005-08-09 19:36:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 15:33:26 -0700 |
| commit | 86e65da9c1fc6fb421b9f796b597b3eced6b55ab (patch) | |
| tree | 69ae9d0c30afe54cea3e4c6119791c1318c2198d /include/net | |
| parent | 0742fd53a3774781255bd1e471e7aa2e4a82d5f7 (diff) | |
| download | kernel_samsung_espresso10-86e65da9c1fc6fb421b9f796b597b3eced6b55ab.zip kernel_samsung_espresso10-86e65da9c1fc6fb421b9f796b597b3eced6b55ab.tar.gz kernel_samsung_espresso10-86e65da9c1fc6fb421b9f796b597b3eced6b55ab.tar.bz2 | |
[NET]: Remove explicit initializations of skb->input_dev
Instead, set it in one place, namely the beginning of
netif_receive_skb().
Based upon suggestions from Jamal Hadi Salim.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/pkt_cls.h | 6 | ||||
| -rw-r--r-- | include/net/x25device.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 4abda6a..b902d24 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -352,10 +352,10 @@ tcf_change_indev(struct tcf_proto *tp, char *indev, struct rtattr *indev_tlv) static inline int tcf_match_indev(struct sk_buff *skb, char *indev) { - if (0 != indev[0]) { - if (NULL == skb->input_dev) + if (indev[0]) { + if (!skb->input_dev) return 0; - else if (0 != strcmp(indev, skb->input_dev->name)) + if (strcmp(indev, skb->input_dev->name)) return 0; } diff --git a/include/net/x25device.h b/include/net/x25device.h index d45ae88..1a31837 100644 --- a/include/net/x25device.h +++ b/include/net/x25device.h @@ -8,7 +8,6 @@ static inline __be16 x25_type_trans(struct sk_buff *skb, struct net_device *dev) { skb->mac.raw = skb->data; - skb->input_dev = skb->dev = dev; skb->pkt_type = PACKET_HOST; return htons(ETH_P_X25); |