Commit 8964be4a authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: rename skb->iif to skb->skb_iif

To help grep games, rename iif to skb_iif
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fa9a6fed
...@@ -282,7 +282,7 @@ static int ieee802154_fake_close(struct net_device *dev) ...@@ -282,7 +282,7 @@ static int ieee802154_fake_close(struct net_device *dev)
static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb, static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
skb->iif = dev->ifindex; skb->skb_iif = dev->ifindex;
skb->dev = dev; skb->dev = dev;
dev->stats.tx_packets++; dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len; dev->stats.tx_bytes += skb->len;
......
...@@ -99,7 +99,7 @@ static void ri_tasklet(unsigned long dev) ...@@ -99,7 +99,7 @@ static void ri_tasklet(unsigned long dev)
stats->tx_bytes +=skb->len; stats->tx_bytes +=skb->len;
rcu_read_lock(); rcu_read_lock();
skb->dev = dev_get_by_index_rcu(&init_net, skb->iif); skb->dev = dev_get_by_index_rcu(&init_net, skb->skb_iif);
if (!skb->dev) { if (!skb->dev) {
rcu_read_unlock(); rcu_read_unlock();
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -107,7 +107,7 @@ static void ri_tasklet(unsigned long dev) ...@@ -107,7 +107,7 @@ static void ri_tasklet(unsigned long dev)
break; break;
} }
rcu_read_unlock(); rcu_read_unlock();
skb->iif = _dev->ifindex; skb->skb_iif = _dev->ifindex;
if (from & AT_EGRESS) { if (from & AT_EGRESS) {
dp->st_rx_frm_egr++; dp->st_rx_frm_egr++;
...@@ -172,7 +172,7 @@ static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -172,7 +172,7 @@ static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev)
stats->rx_packets++; stats->rx_packets++;
stats->rx_bytes+=skb->len; stats->rx_bytes+=skb->len;
if (!(from & (AT_INGRESS|AT_EGRESS)) || !skb->iif) { if (!(from & (AT_INGRESS|AT_EGRESS)) || !skb->skb_iif) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
stats->rx_dropped++; stats->rx_dropped++;
return NETDEV_TX_OK; return NETDEV_TX_OK;
......
...@@ -299,7 +299,7 @@ typedef unsigned char *sk_buff_data_t; ...@@ -299,7 +299,7 @@ typedef unsigned char *sk_buff_data_t;
* @nfctinfo: Relationship of this skb to the connection * @nfctinfo: Relationship of this skb to the connection
* @nfct_reasm: netfilter conntrack re-assembly pointer * @nfct_reasm: netfilter conntrack re-assembly pointer
* @nf_bridge: Saved data about a bridged frame - see br_netfilter.c * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
* @iif: ifindex of device we arrived on * @skb_iif: ifindex of device we arrived on
* @queue_mapping: Queue mapping for multiqueue devices * @queue_mapping: Queue mapping for multiqueue devices
* @tc_index: Traffic control index * @tc_index: Traffic control index
* @tc_verd: traffic control verdict * @tc_verd: traffic control verdict
...@@ -366,7 +366,7 @@ struct sk_buff { ...@@ -366,7 +366,7 @@ struct sk_buff {
struct nf_bridge_info *nf_bridge; struct nf_bridge_info *nf_bridge;
#endif #endif
int iif; int skb_iif;
#ifdef CONFIG_NET_SCHED #ifdef CONFIG_NET_SCHED
__u16 tc_index; /* traffic control index */ __u16 tc_index; /* traffic control index */
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
......
...@@ -343,9 +343,9 @@ tcf_match_indev(struct sk_buff *skb, char *indev) ...@@ -343,9 +343,9 @@ tcf_match_indev(struct sk_buff *skb, char *indev)
struct net_device *dev; struct net_device *dev;
if (indev[0]) { if (indev[0]) {
if (!skb->iif) if (!skb->skb_iif)
return 0; return 0;
dev = __dev_get_by_index(dev_net(skb->dev), skb->iif); dev = __dev_get_by_index(dev_net(skb->dev), skb->skb_iif);
if (!dev || strcmp(indev, dev->name)) if (!dev || strcmp(indev, dev->name))
return 0; return 0;
} }
......
...@@ -2287,7 +2287,7 @@ static int ing_filter(struct sk_buff *skb) ...@@ -2287,7 +2287,7 @@ static int ing_filter(struct sk_buff *skb)
if (MAX_RED_LOOP < ttl++) { if (MAX_RED_LOOP < ttl++) {
printk(KERN_WARNING printk(KERN_WARNING
"Redir loop detected Dropping packet (%d->%d)\n", "Redir loop detected Dropping packet (%d->%d)\n",
skb->iif, dev->ifindex); skb->skb_iif, dev->ifindex);
return TC_ACT_SHOT; return TC_ACT_SHOT;
} }
...@@ -2395,8 +2395,8 @@ int netif_receive_skb(struct sk_buff *skb) ...@@ -2395,8 +2395,8 @@ int netif_receive_skb(struct sk_buff *skb)
if (netpoll_receive_skb(skb)) if (netpoll_receive_skb(skb))
return NET_RX_DROP; return NET_RX_DROP;
if (!skb->iif) if (!skb->skb_iif)
skb->iif = skb->dev->ifindex; skb->skb_iif = skb->dev->ifindex;
null_or_orig = NULL; null_or_orig = NULL;
orig_dev = skb->dev; orig_dev = skb->dev;
......
...@@ -549,7 +549,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) ...@@ -549,7 +549,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
#endif #endif
new->protocol = old->protocol; new->protocol = old->protocol;
new->mark = old->mark; new->mark = old->mark;
new->iif = old->iif; new->skb_iif = old->skb_iif;
__nf_copy(new, old); __nf_copy(new, old);
#if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \ #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE) defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)
......
...@@ -1550,7 +1550,7 @@ int netlbl_unlabel_getattr(const struct sk_buff *skb, ...@@ -1550,7 +1550,7 @@ int netlbl_unlabel_getattr(const struct sk_buff *skb,
struct netlbl_unlhsh_iface *iface; struct netlbl_unlhsh_iface *iface;
rcu_read_lock(); rcu_read_lock();
iface = netlbl_unlhsh_search_iface_def(skb->iif); iface = netlbl_unlhsh_search_iface_def(skb->skb_iif);
if (iface == NULL) if (iface == NULL)
goto unlabel_getattr_nolabel; goto unlabel_getattr_nolabel;
switch (family) { switch (family) {
......
...@@ -185,7 +185,7 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a, ...@@ -185,7 +185,7 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
skb2->tc_verd = SET_TC_FROM(skb2->tc_verd, at); skb2->tc_verd = SET_TC_FROM(skb2->tc_verd, at);
skb2->dev = dev; skb2->dev = dev;
skb2->iif = skb->dev->ifindex; skb2->skb_iif = skb->dev->ifindex;
dev_queue_xmit(skb2); dev_queue_xmit(skb2);
err = 0; err = 0;
......
...@@ -171,7 +171,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb) ...@@ -171,7 +171,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb)
static u32 flow_get_iif(const struct sk_buff *skb) static u32 flow_get_iif(const struct sk_buff *skb)
{ {
return skb->iif; return skb->skb_iif;
} }
static u32 flow_get_priority(const struct sk_buff *skb) static u32 flow_get_priority(const struct sk_buff *skb)
......
...@@ -4085,7 +4085,7 @@ static int selinux_sock_rcv_skb_compat(struct sock *sk, struct sk_buff *skb, ...@@ -4085,7 +4085,7 @@ static int selinux_sock_rcv_skb_compat(struct sock *sk, struct sk_buff *skb,
char *addrp; char *addrp;
COMMON_AUDIT_DATA_INIT(&ad, NET); COMMON_AUDIT_DATA_INIT(&ad, NET);
ad.u.net.netif = skb->iif; ad.u.net.netif = skb->skb_iif;
ad.u.net.family = family; ad.u.net.family = family;
err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL); err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
if (err) if (err)
...@@ -4147,7 +4147,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb) ...@@ -4147,7 +4147,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
return 0; return 0;
COMMON_AUDIT_DATA_INIT(&ad, NET); COMMON_AUDIT_DATA_INIT(&ad, NET);
ad.u.net.netif = skb->iif; ad.u.net.netif = skb->skb_iif;
ad.u.net.family = family; ad.u.net.family = family;
err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL); err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
if (err) if (err)
...@@ -4159,7 +4159,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb) ...@@ -4159,7 +4159,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
err = selinux_skb_peerlbl_sid(skb, family, &peer_sid); err = selinux_skb_peerlbl_sid(skb, family, &peer_sid);
if (err) if (err)
return err; return err;
err = selinux_inet_sys_rcv_skb(skb->iif, addrp, family, err = selinux_inet_sys_rcv_skb(skb->skb_iif, addrp, family,
peer_sid, &ad); peer_sid, &ad);
if (err) { if (err) {
selinux_netlbl_err(skb, err, 0); selinux_netlbl_err(skb, err, 0);
......
...@@ -2602,7 +2602,7 @@ static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb) ...@@ -2602,7 +2602,7 @@ static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
#ifdef CONFIG_AUDIT #ifdef CONFIG_AUDIT
smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET); smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
ad.a.u.net.family = sk->sk_family; ad.a.u.net.family = sk->sk_family;
ad.a.u.net.netif = skb->iif; ad.a.u.net.netif = skb->skb_iif;
ipv4_skb_to_auditdata(skb, &ad.a, NULL); ipv4_skb_to_auditdata(skb, &ad.a, NULL);
#endif #endif
/* /*
...@@ -2757,7 +2757,7 @@ static int smack_inet_conn_request(struct sock *sk, struct sk_buff *skb, ...@@ -2757,7 +2757,7 @@ static int smack_inet_conn_request(struct sock *sk, struct sk_buff *skb,
#ifdef CONFIG_AUDIT #ifdef CONFIG_AUDIT
smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET); smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
ad.a.u.net.family = family; ad.a.u.net.family = family;
ad.a.u.net.netif = skb->iif; ad.a.u.net.netif = skb->skb_iif;
ipv4_skb_to_auditdata(skb, &ad.a, NULL); ipv4_skb_to_auditdata(skb, &ad.a, NULL);
#endif #endif
/* /*
......
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