Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/ieee802154/fakehard.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static int ieee802154_fake_close(struct net_device *dev) 
static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb,

					      struct net_device *dev)

{

	skb->iif = dev->ifindex;

	skb->skb_iif = dev->ifindex;

	skb->dev = dev;

	dev->stats.tx_packets++;

	dev->stats.tx_bytes += skb->len;

drivers/net/ifb.c

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void ri_tasklet(unsigned long dev) 
		stats->tx_bytes +=skb->len;



		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) {

			rcu_read_unlock();

			dev_kfree_skb(skb);
@@ -107,7 +107,7 @@ static void ri_tasklet(unsigned long dev) 
			break;

		}

		rcu_read_unlock();

		skb->iif = _dev->ifindex;

		skb->skb_iif = _dev->ifindex;



		if (from & AT_EGRESS) {

			dp->st_rx_frm_egr++;
@@ -172,7 +172,7 @@ static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev) 
	stats->rx_packets++;

	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);

		stats->rx_dropped++;

		return NETDEV_TX_OK;

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ typedef unsigned char *sk_buff_data_t; 
 *	@nfctinfo: Relationship of this skb to the connection

 *	@nfct_reasm: netfilter conntrack re-assembly pointer

 *	@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

 *	@tc_index: Traffic control index

 *	@tc_verd: traffic control verdict
@@ -366,7 +366,7 @@ struct sk_buff { 
	struct nf_bridge_info	*nf_bridge;

#endif



	int			iif;

	int			skb_iif;

#ifdef CONFIG_NET_SCHED

	__u16			tc_index;	/* traffic control index */

#ifdef CONFIG_NET_CLS_ACT

include/net/pkt_cls.h

+2 −2
Original line number Diff line number Diff line
@@ -343,9 +343,9 @@ tcf_match_indev(struct sk_buff *skb, char *indev) 
	struct net_device *dev;



	if (indev[0]) {

		if  (!skb->iif)

		if  (!skb->skb_iif)

			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))

			return 0;

	}

net/core/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -2287,7 +2287,7 @@ static int ing_filter(struct sk_buff *skb) 
	if (MAX_RED_LOOP < ttl++) {

		printk(KERN_WARNING

		       "Redir loop detected Dropping packet (%d->%d)\n",

		       skb->iif, dev->ifindex);

		       skb->skb_iif, dev->ifindex);

		return TC_ACT_SHOT;

	}
@@ -2395,8 +2395,8 @@ int netif_receive_skb(struct sk_buff *skb) 
	if (netpoll_receive_skb(skb))

		return NET_RX_DROP;



	if (!skb->iif)

		skb->iif = skb->dev->ifindex;

	if (!skb->skb_iif)

		skb->skb_iif = skb->dev->ifindex;



	null_or_orig = NULL;

	orig_dev = skb->dev;