[NET]: Convert net/{ipv4,ipv6,sched} to netdev_priv (2941a486) · Commits · git / linux-net

net/ipv4/ip_gre.c

+15 −18

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ static struct ip_tunnel * ipgre_tunnel_lookup(u32 remote, u32 local, u32 key)
		}

		if (ipgre_fb_tunnel_dev->flags&IFF_UP)
		return ipgre_fb_tunnel_dev->priv;
		return netdev_priv(ipgre_fb_tunnel_dev);
		return NULL;
		}

		@@ -278,7 +278,7 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int
		return NULL;

		dev->init = ipgre_tunnel_init;
		nt = dev->priv;
		nt = netdev_priv(dev);
		nt->parms = *parms;

		if (register_netdevice(dev) < 0) {
		@@ -286,9 +286,6 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int
		goto failed;
		}

		nt = dev->priv;
		nt->parms = *parms;

		dev_hold(dev);
		ipgre_tunnel_link(nt);
		return nt;
		@@ -299,7 +296,7 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int

		static void ipgre_tunnel_uninit(struct net_device *dev)
		{
		ipgre_tunnel_unlink((struct ip_tunnel*)dev->priv);
		ipgre_tunnel_unlink(netdev_priv(dev));
		dev_put(dev);
		}

		@@ -518,7 +515,7 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
		skb2->dst->ops->update_pmtu(skb2->dst, rel_info);
		rel_info = htonl(rel_info);
		} else if (type == ICMP_TIME_EXCEEDED) {
		struct ip_tunnel t = (struct ip_tunnel)skb2->dev->priv;
		struct ip_tunnel *t = netdev_priv(skb2->dev);
		if (t->parms.iph.ttl) {
		rel_type = ICMP_DEST_UNREACH;
		rel_code = ICMP_HOST_UNREACH;
		@@ -669,7 +666,7 @@ static int ipgre_rcv(struct sk_buff *skb)

		static int ipgre_tunnel_xmit(struct sk_buff skb, struct net_device dev)
		{
		struct ip_tunnel tunnel = (struct ip_tunnel)dev->priv;
		struct ip_tunnel *tunnel = netdev_priv(dev);
		struct net_device_stats *stats = &tunnel->stat;
		struct iphdr *old_iph = skb->nh.iph;
		struct iphdr *tiph;
		@@ -915,7 +912,7 @@ ipgre_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		t = ipgre_tunnel_locate(&p, 0);
		}
		if (t == NULL)
		t = (struct ip_tunnel*)dev->priv;
		t = netdev_priv(dev);
		memcpy(&p, &t->parms, sizeof(p));
		if (copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof(p)))
		err = -EFAULT;
		@@ -955,7 +952,7 @@ ipgre_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		} else {
		unsigned nflags=0;

		t = (struct ip_tunnel*)dev->priv;
		t = netdev_priv(dev);

		if (MULTICAST(p.iph.daddr))
		nflags = IFF_BROADCAST;
		@@ -1004,7 +1001,7 @@ ipgre_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		if ((t = ipgre_tunnel_locate(&p, 0)) == NULL)
		goto done;
		err = -EPERM;
		if (t == ipgre_fb_tunnel_dev->priv)
		if (t == netdev_priv(ipgre_fb_tunnel_dev))
		goto done;
		dev = t->dev;
		}
		@@ -1021,12 +1018,12 @@ ipgre_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)

		static struct net_device_stats ipgre_tunnel_get_stats(struct net_device dev)
		{
		return &(((struct ip_tunnel*)dev->priv)->stat);
		return &(((struct ip_tunnel*)netdev_priv(dev))->stat);
		}

		static int ipgre_tunnel_change_mtu(struct net_device *dev, int new_mtu)
		{
		struct ip_tunnel tunnel = (struct ip_tunnel)dev->priv;
		struct ip_tunnel *tunnel = netdev_priv(dev);
		if (new_mtu < 68 \|\| new_mtu > 0xFFF8 - tunnel->hlen)
		return -EINVAL;
		dev->mtu = new_mtu;
		@@ -1066,7 +1063,7 @@ static int ipgre_tunnel_change_mtu(struct net_device *dev, int new_mtu)
		static int ipgre_header(struct sk_buff skb, struct net_device dev, unsigned short type,
		void daddr, void saddr, unsigned len)
		{
		struct ip_tunnel t = (struct ip_tunnel)dev->priv;
		struct ip_tunnel *t = netdev_priv(dev);
		struct iphdr iph = (struct iphdr )skb_push(skb, t->hlen);
		u16 p = (u16)(iph+1);

		@@ -1093,7 +1090,7 @@ static int ipgre_header(struct sk_buff skb, struct net_device dev, unsigned sh

		static int ipgre_open(struct net_device *dev)
		{
		struct ip_tunnel t = (struct ip_tunnel)dev->priv;
		struct ip_tunnel *t = netdev_priv(dev);

		if (MULTICAST(t->parms.iph.daddr)) {
		struct flowi fl = { .oif = t->parms.link,
		@@ -1117,7 +1114,7 @@ static int ipgre_open(struct net_device *dev)

		static int ipgre_close(struct net_device *dev)
		{
		struct ip_tunnel t = (struct ip_tunnel)dev->priv;
		struct ip_tunnel *t = netdev_priv(dev);
		if (MULTICAST(t->parms.iph.daddr) && t->mlink) {
		struct in_device *in_dev = inetdev_by_index(t->mlink);
		if (in_dev) {
		@@ -1157,7 +1154,7 @@ static int ipgre_tunnel_init(struct net_device *dev)
		int mtu = ETH_DATA_LEN;
		int addend = sizeof(struct iphdr) + 4;

		tunnel = (struct ip_tunnel*)dev->priv;
		tunnel = netdev_priv(dev);
		iph = &tunnel->parms.iph;

		tunnel->dev = dev;
		@@ -1221,7 +1218,7 @@ static int ipgre_tunnel_init(struct net_device *dev)

		static int __init ipgre_fb_tunnel_init(struct net_device *dev)
		{
		struct ip_tunnel tunnel = (struct ip_tunnel)dev->priv;
		struct ip_tunnel *tunnel = netdev_priv(dev);
		struct iphdr *iph = &tunnel->parms.iph;

		tunnel->dev = dev;

net/ipv4/ipip.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c
		if (dev == NULL)
		return NULL;

		nt = dev->priv;
		nt = netdev_priv(dev);
		SET_MODULE_OWNER(dev);
		dev->init = ipip_tunnel_init;
		nt->parms = *parms;
		@@ -269,7 +269,7 @@ static void ipip_tunnel_uninit(struct net_device *dev)
		tunnels_wc[0] = NULL;
		write_unlock_bh(&ipip_lock);
		} else
		ipip_tunnel_unlink((struct ip_tunnel*)dev->priv);
		ipip_tunnel_unlink(netdev_priv(dev));
		dev_put(dev);
		}

		@@ -443,7 +443,7 @@ static void ipip_err(struct sk_buff *skb, u32 info)
		skb2->dst->ops->update_pmtu(skb2->dst, rel_info);
		rel_info = htonl(rel_info);
		} else if (type == ICMP_TIME_EXCEEDED) {
		struct ip_tunnel t = (struct ip_tunnel)skb2->dev->priv;
		struct ip_tunnel *t = netdev_priv(skb2->dev);
		if (t->parms.iph.ttl) {
		rel_type = ICMP_DEST_UNREACH;
		rel_code = ICMP_HOST_UNREACH;
		@@ -514,7 +514,7 @@ static int ipip_rcv(struct sk_buff *skb)

		static int ipip_tunnel_xmit(struct sk_buff skb, struct net_device dev)
		{
		struct ip_tunnel tunnel = (struct ip_tunnel)dev->priv;
		struct ip_tunnel *tunnel = netdev_priv(dev);
		struct net_device_stats *stats = &tunnel->stat;
		struct iphdr *tiph = &tunnel->parms.iph;
		u8 tos = tunnel->parms.iph.tos;
		@@ -674,7 +674,7 @@ ipip_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		t = ipip_tunnel_locate(&p, 0);
		}
		if (t == NULL)
		t = (struct ip_tunnel*)dev->priv;
		t = netdev_priv(dev);
		memcpy(&p, &t->parms, sizeof(p));
		if (copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof(p)))
		err = -EFAULT;
		@@ -711,7 +711,7 @@ ipip_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		err = -EINVAL;
		break;
		}
		t = (struct ip_tunnel*)dev->priv;
		t = netdev_priv(dev);
		ipip_tunnel_unlink(t);
		t->parms.iph.saddr = p.iph.saddr;
		t->parms.iph.daddr = p.iph.daddr;
		@@ -765,7 +765,7 @@ ipip_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)

		static struct net_device_stats ipip_tunnel_get_stats(struct net_device dev)
		{
		return &(((struct ip_tunnel*)dev->priv)->stat);
		return &(((struct ip_tunnel*)netdev_priv(dev))->stat);
		}

		static int ipip_tunnel_change_mtu(struct net_device *dev, int new_mtu)
		@@ -800,7 +800,7 @@ static int ipip_tunnel_init(struct net_device *dev)
		struct ip_tunnel *tunnel;
		struct iphdr *iph;

		tunnel = (struct ip_tunnel*)dev->priv;
		tunnel = netdev_priv(dev);
		iph = &tunnel->parms.iph;

		tunnel->dev = dev;
		@@ -838,7 +838,7 @@ static int ipip_tunnel_init(struct net_device *dev)

		static int __init ipip_fb_tunnel_init(struct net_device *dev)
		{
		struct ip_tunnel *tunnel = dev->priv;
		struct ip_tunnel *tunnel = netdev_priv(dev);
		struct iphdr *iph = &tunnel->parms.iph;

		tunnel->dev = dev;

net/ipv4/ipmr.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -178,8 +178,8 @@ static int reg_vif_num = -1;
		static int reg_vif_xmit(struct sk_buff skb, struct net_device dev)
		{
		read_lock(&mrt_lock);
		((struct net_device_stats*)dev->priv)->tx_bytes += skb->len;
		((struct net_device_stats*)dev->priv)->tx_packets++;
		((struct net_device_stats*)netdev_priv(dev))->tx_bytes += skb->len;
		((struct net_device_stats*)netdev_priv(dev))->tx_packets++;
		ipmr_cache_report(skb, reg_vif_num, IGMPMSG_WHOLEPKT);
		read_unlock(&mrt_lock);
		kfree_skb(skb);
		@@ -188,7 +188,7 @@ static int reg_vif_xmit(struct sk_buff skb, struct net_device dev)

		static struct net_device_stats reg_vif_get_stats(struct net_device dev)
		{
		return (struct net_device_stats*)dev->priv;
		return (struct net_device_stats*)netdev_priv(dev);
		}

		static void reg_vif_setup(struct net_device *dev)
		@@ -1149,8 +1149,8 @@ static void ipmr_queue_xmit(struct sk_buff skb, struct mfc_cache c, int vifi)
		if (vif->flags & VIFF_REGISTER) {
		vif->pkt_out++;
		vif->bytes_out+=skb->len;
		((struct net_device_stats*)vif->dev->priv)->tx_bytes += skb->len;
		((struct net_device_stats*)vif->dev->priv)->tx_packets++;
		((struct net_device_stats*)netdev_priv(vif->dev))->tx_bytes += skb->len;
		((struct net_device_stats*)netdev_priv(vif->dev))->tx_packets++;
		ipmr_cache_report(skb, vifi, IGMPMSG_WHOLEPKT);
		kfree_skb(skb);
		return;
		@@ -1210,8 +1210,8 @@ static void ipmr_queue_xmit(struct sk_buff skb, struct mfc_cache c, int vifi)
		if (vif->flags & VIFF_TUNNEL) {
		ip_encap(skb, vif->local, vif->remote);
		/* FIXME: extra output firewall step used to be here. --RR */
		((struct ip_tunnel *)vif->dev->priv)->stat.tx_packets++;
		((struct ip_tunnel *)vif->dev->priv)->stat.tx_bytes+=skb->len;
		((struct ip_tunnel *)netdev_priv(vif->dev))->stat.tx_packets++;
		((struct ip_tunnel *)netdev_priv(vif->dev))->stat.tx_bytes+=skb->len;
		}

		IPCB(skb)->flags \|= IPSKB_FORWARDED;
		@@ -1467,8 +1467,8 @@ int pim_rcv_v1(struct sk_buff * skb)
		skb->pkt_type = PACKET_HOST;
		dst_release(skb->dst);
		skb->dst = NULL;
		((struct net_device_stats*)reg_dev->priv)->rx_bytes += skb->len;
		((struct net_device_stats*)reg_dev->priv)->rx_packets++;
		((struct net_device_stats*)netdev_priv(reg_dev))->rx_bytes += skb->len;
		((struct net_device_stats*)netdev_priv(reg_dev))->rx_packets++;
		nf_reset(skb);
		netif_rx(skb);
		dev_put(reg_dev);
		@@ -1522,8 +1522,8 @@ static int pim_rcv(struct sk_buff * skb)
		skb->ip_summed = 0;
		skb->pkt_type = PACKET_HOST;
		dst_release(skb->dst);
		((struct net_device_stats*)reg_dev->priv)->rx_bytes += skb->len;
		((struct net_device_stats*)reg_dev->priv)->rx_packets++;
		((struct net_device_stats*)netdev_priv(reg_dev))->rx_bytes += skb->len;
		((struct net_device_stats*)netdev_priv(reg_dev))->rx_packets++;
		skb->dst = NULL;
		nf_reset(skb);
		netif_rx(skb);

net/ipv6/ip6_tunnel.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -243,7 +243,7 @@ ip6_tnl_create(struct ip6_tnl_parm p, struct ip6_tnl *pt)
		if (dev == NULL)
		return -ENOMEM;

		t = dev->priv;
		t = netdev_priv(dev);
		dev->init = ip6ip6_tnl_dev_init;
		t->parms = *p;

		@@ -308,7 +308,7 @@ ip6ip6_tnl_locate(struct ip6_tnl_parm p, struct ip6_tnl *pt, int create)
		static void
		ip6ip6_tnl_dev_uninit(struct net_device *dev)
		{
		struct ip6_tnl *t = dev->priv;
		struct ip6_tnl *t = netdev_priv(dev);

		if (dev == ip6ip6_fb_tnl_dev) {
		write_lock_bh(&ip6ip6_lock);
		@@ -623,7 +623,7 @@ ip6ip6_tnl_addr_conflict(struct ip6_tnl t, struct ipv6hdr hdr)
		static int
		ip6ip6_tnl_xmit(struct sk_buff skb, struct net_device dev)
		{
		struct ip6_tnl t = (struct ip6_tnl ) dev->priv;
		struct ip6_tnl *t = netdev_priv(dev);
		struct net_device_stats *stats = &t->stat;
		struct ipv6hdr *ipv6h = skb->nh.ipv6h;
		struct ipv6_txoptions *opt = NULL;
		@@ -933,11 +933,11 @@ ip6ip6_tnl_ioctl(struct net_device dev, struct ifreq ifr, int cmd)
		break;
		}
		if ((err = ip6ip6_tnl_locate(&p, &t, 0)) == -ENODEV)
		t = (struct ip6_tnl *) dev->priv;
		t = netdev_priv(dev);
		else if (err)
		break;
		} else
		t = (struct ip6_tnl *) dev->priv;
		t = netdev_priv(dev);

		memcpy(&p, &t->parms, sizeof (p));
		if (copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof (p))) {
		@@ -955,7 +955,7 @@ ip6ip6_tnl_ioctl(struct net_device dev, struct ifreq ifr, int cmd)
		break;
		}
		if (!create && dev != ip6ip6_fb_tnl_dev) {
		t = (struct ip6_tnl *) dev->priv;
		t = netdev_priv(dev);
		}
		if (!t && (err = ip6ip6_tnl_locate(&p, &t, create))) {
		break;
		@@ -991,12 +991,12 @@ ip6ip6_tnl_ioctl(struct net_device dev, struct ifreq ifr, int cmd)
		err = ip6ip6_tnl_locate(&p, &t, 0);
		if (err)
		break;
		if (t == ip6ip6_fb_tnl_dev->priv) {
		if (t == netdev_priv(ip6ip6_fb_tnl_dev)) {
		err = -EPERM;
		break;
		}
		} else {
		t = (struct ip6_tnl *) dev->priv;
		t = netdev_priv(dev);
		}
		err = unregister_netdevice(t->dev);
		break;
		@@ -1016,7 +1016,7 @@ ip6ip6_tnl_ioctl(struct net_device dev, struct ifreq ifr, int cmd)
		static struct net_device_stats *
		ip6ip6_tnl_get_stats(struct net_device *dev)
		{
		return &(((struct ip6_tnl *) dev->priv)->stat);
		return &(((struct ip6_tnl *)netdev_priv(dev))->stat);
		}

		/**
		@@ -1073,7 +1073,7 @@ static void ip6ip6_tnl_dev_setup(struct net_device *dev)
		static inline void
		ip6ip6_tnl_dev_init_gen(struct net_device *dev)
		{
		struct ip6_tnl t = (struct ip6_tnl ) dev->priv;
		struct ip6_tnl *t = netdev_priv(dev);
		t->fl.proto = IPPROTO_IPV6;
		t->dev = dev;
		strcpy(t->parms.name, dev->name);
		@@ -1087,7 +1087,7 @@ ip6ip6_tnl_dev_init_gen(struct net_device *dev)
		static int
		ip6ip6_tnl_dev_init(struct net_device *dev)
		{
		struct ip6_tnl t = (struct ip6_tnl ) dev->priv;
		struct ip6_tnl *t = netdev_priv(dev);
		ip6ip6_tnl_dev_init_gen(dev);
		ip6ip6_tnl_link_config(t);
		return 0;
		@@ -1103,7 +1103,7 @@ ip6ip6_tnl_dev_init(struct net_device *dev)
		static int
		ip6ip6_fb_tnl_dev_init(struct net_device *dev)
		{
		struct ip6_tnl *t = dev->priv;
		struct ip6_tnl *t = netdev_priv(dev);
		ip6ip6_tnl_dev_init_gen(dev);
		dev_hold(dev);
		tnls_wc[0] = t;

net/ipv6/sit.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int
		if (dev == NULL)
		return NULL;

		nt = dev->priv;
		nt = netdev_priv(dev);
		dev->init = ipip6_tunnel_init;
		nt->parms = *parms;

		@@ -210,7 +210,7 @@ static void ipip6_tunnel_uninit(struct net_device *dev)
		write_unlock_bh(&ipip6_lock);
		dev_put(dev);
		} else {
		ipip6_tunnel_unlink((struct ip_tunnel*)dev->priv);
		ipip6_tunnel_unlink(netdev_priv(dev));
		dev_put(dev);
		}
		}
		@@ -346,7 +346,7 @@ static void ipip6_err(struct sk_buff *skb, u32 info)
		rt6i = rt6_lookup(&iph6->daddr, &iph6->saddr, NULL, 0);

		if (rt6i && rt6i->rt6i_dev && rt6i->rt6i_dev->type == ARPHRD_SIT) {
		struct ip_tunnel * t = (struct ip_tunnel*)rt6i->rt6i_dev->priv;
		struct ip_tunnel *t = netdev_priv(rt6i->rt6i_dev);
		if (rel_type == ICMPV6_TIME_EXCEED && t->parms.iph.ttl) {
		rel_type = ICMPV6_DEST_UNREACH;
		rel_code = ICMPV6_ADDR_UNREACH;
		@@ -424,7 +424,7 @@ static inline u32 try_6to4(struct in6_addr *v6dst)

		static int ipip6_tunnel_xmit(struct sk_buff skb, struct net_device dev)
		{
		struct ip_tunnel tunnel = (struct ip_tunnel)dev->priv;
		struct ip_tunnel *tunnel = netdev_priv(dev);
		struct net_device_stats *stats = &tunnel->stat;
		struct iphdr *tiph = &tunnel->parms.iph;
		struct ipv6hdr *iph6 = skb->nh.ipv6h;
		@@ -610,7 +610,7 @@ ipip6_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		t = ipip6_tunnel_locate(&p, 0);
		}
		if (t == NULL)
		t = (struct ip_tunnel*)dev->priv;
		t = netdev_priv(dev);
		memcpy(&p, &t->parms, sizeof(p));
		if (copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof(p)))
		err = -EFAULT;
		@@ -647,7 +647,7 @@ ipip6_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		err = -EINVAL;
		break;
		}
		t = (struct ip_tunnel*)dev->priv;
		t = netdev_priv(dev);
		ipip6_tunnel_unlink(t);
		t->parms.iph.saddr = p.iph.saddr;
		t->parms.iph.daddr = p.iph.daddr;
		@@ -683,7 +683,7 @@ ipip6_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		if ((t = ipip6_tunnel_locate(&p, 0)) == NULL)
		goto done;
		err = -EPERM;
		if (t == ipip6_fb_tunnel_dev->priv)
		if (t == netdev_priv(ipip6_fb_tunnel_dev))
		goto done;
		dev = t->dev;
		}
		@@ -700,7 +700,7 @@ ipip6_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)

		static struct net_device_stats ipip6_tunnel_get_stats(struct net_device dev)
		{
		return &(((struct ip_tunnel*)dev->priv)->stat);
		return &(((struct ip_tunnel*)netdev_priv(dev))->stat);
		}

		static int ipip6_tunnel_change_mtu(struct net_device *dev, int new_mtu)
		@@ -735,7 +735,7 @@ static int ipip6_tunnel_init(struct net_device *dev)
		struct ip_tunnel *tunnel;
		struct iphdr *iph;

		tunnel = (struct ip_tunnel*)dev->priv;
		tunnel = netdev_priv(dev);
		iph = &tunnel->parms.iph;

		tunnel->dev = dev;
		@@ -775,7 +775,7 @@ static int ipip6_tunnel_init(struct net_device *dev)

		static int __init ipip6_fb_tunnel_init(struct net_device *dev)
		{
		struct ip_tunnel *tunnel = dev->priv;
		struct ip_tunnel *tunnel = netdev_priv(dev);
		struct iphdr *iph = &tunnel->parms.iph;

		tunnel->dev = dev;