aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/appletalk/ipddp.c1
-rw-r--r--drivers/net/bonding/bond_main.c1
-rw-r--r--drivers/net/eql.c1
-rw-r--r--drivers/net/ifb.c1
-rw-r--r--drivers/net/loopback.c1
-rw-r--r--drivers/net/macvlan.c1
-rw-r--r--drivers/net/wan/hdlc_fr.c1
-rw-r--r--include/linux/if.h3
-rw-r--r--net/8021q/vlan_dev.c1
-rw-r--r--net/core/dev.c9
10 files changed, 20 insertions, 0 deletions
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index da64ba88d7f8..f939e92fcf8a 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -71,6 +71,7 @@ static struct net_device * __init ipddp_init(void)
71 if (!dev) 71 if (!dev)
72 return ERR_PTR(-ENOMEM); 72 return ERR_PTR(-ENOMEM);
73 73
74 dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
74 strcpy(dev->name, "ipddp%d"); 75 strcpy(dev->name, "ipddp%d");
75 76
76 if (version_printed++ == 0) 77 if (version_printed++ == 0)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 96d7689995cd..92a9d69c5650 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -5148,6 +5148,7 @@ int bond_create(char *name, struct bond_params *params)
5148 goto out_rtnl; 5148 goto out_rtnl;
5149 } 5149 }
5150 5150
5151 bond_dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
5151 if (!name) { 5152 if (!name) {
5152 res = dev_alloc_name(bond_dev, "bond%d"); 5153 res = dev_alloc_name(bond_dev, "bond%d");
5153 if (res < 0) 5154 if (res < 0)
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index 5210bb1027cc..19b7dd983944 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -194,6 +194,7 @@ static void __init eql_setup(struct net_device *dev)
194 194
195 dev->type = ARPHRD_SLIP; 195 dev->type = ARPHRD_SLIP;
196 dev->tx_queue_len = 5; /* Hands them off fast */ 196 dev->tx_queue_len = 5; /* Hands them off fast */
197 dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
197} 198}
198 199
199static int eql_open(struct net_device *dev) 200static int eql_open(struct net_device *dev)
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 60a263001933..96713ef06298 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -156,6 +156,7 @@ static void ifb_setup(struct net_device *dev)
156 156
157 dev->flags |= IFF_NOARP; 157 dev->flags |= IFF_NOARP;
158 dev->flags &= ~IFF_MULTICAST; 158 dev->flags &= ~IFF_MULTICAST;
159 dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
159 random_ether_addr(dev->dev_addr); 160 random_ether_addr(dev->dev_addr);
160} 161}
161 162
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 6f71157bea8e..da472c687481 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -170,6 +170,7 @@ static void loopback_setup(struct net_device *dev)
170 dev->tx_queue_len = 0; 170 dev->tx_queue_len = 0;
171 dev->type = ARPHRD_LOOPBACK; /* 0x0001*/ 171 dev->type = ARPHRD_LOOPBACK; /* 0x0001*/
172 dev->flags = IFF_LOOPBACK; 172 dev->flags = IFF_LOOPBACK;
173 dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
173 dev->features = NETIF_F_SG | NETIF_F_FRAGLIST 174 dev->features = NETIF_F_SG | NETIF_F_FRAGLIST
174 | NETIF_F_TSO 175 | NETIF_F_TSO
175 | NETIF_F_NO_CSUM 176 | NETIF_F_NO_CSUM
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 329cd50d0e29..d5334b41e4b4 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -414,6 +414,7 @@ static void macvlan_setup(struct net_device *dev)
414{ 414{
415 ether_setup(dev); 415 ether_setup(dev);
416 416
417 dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
417 dev->netdev_ops = &macvlan_netdev_ops; 418 dev->netdev_ops = &macvlan_netdev_ops;
418 dev->destructor = free_netdev; 419 dev->destructor = free_netdev;
419 dev->header_ops = &macvlan_hard_header_ops, 420 dev->header_ops = &macvlan_hard_header_ops,
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 800530101093..bfa0161a02d3 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -1054,6 +1054,7 @@ static void pvc_setup(struct net_device *dev)
1054 dev->flags = IFF_POINTOPOINT; 1054 dev->flags = IFF_POINTOPOINT;
1055 dev->hard_header_len = 10; 1055 dev->hard_header_len = 10;
1056 dev->addr_len = 2; 1056 dev->addr_len = 2;
1057 dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
1057} 1058}
1058 1059
1059static const struct net_device_ops pvc_ops = { 1060static const struct net_device_ops pvc_ops = {
diff --git a/include/linux/if.h b/include/linux/if.h
index 1108f3e099e3..b9a6229f3be7 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -67,6 +67,9 @@
67#define IFF_ISATAP 0x80 /* ISATAP interface (RFC4214) */ 67#define IFF_ISATAP 0x80 /* ISATAP interface (RFC4214) */
68#define IFF_MASTER_ARPMON 0x100 /* bonding master, ARP mon in use */ 68#define IFF_MASTER_ARPMON 0x100 /* bonding master, ARP mon in use */
69#define IFF_WAN_HDLC 0x200 /* WAN HDLC device */ 69#define IFF_WAN_HDLC 0x200 /* WAN HDLC device */
70#define IFF_XMIT_DST_RELEASE 0x400 /* dev_hard_start_xmit() is allowed to
71 * release skb->dst
72 */
70 73
71#define IF_GET_IFACE 0x0001 /* for querying only */ 74#define IF_GET_IFACE 0x0001 /* for querying only */
72#define IF_GET_PROTO 0x0002 75#define IF_GET_PROTO 0x0002
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 8faacee68633..ff7572ac5481 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -739,6 +739,7 @@ void vlan_setup(struct net_device *dev)
739 ether_setup(dev); 739 ether_setup(dev);
740 740
741 dev->priv_flags |= IFF_802_1Q_VLAN; 741 dev->priv_flags |= IFF_802_1Q_VLAN;
742 dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
742 dev->tx_queue_len = 0; 743 dev->tx_queue_len = 0;
743 744
744 dev->netdev_ops = &vlan_netdev_ops; 745 dev->netdev_ops = &vlan_netdev_ops;
diff --git a/net/core/dev.c b/net/core/dev.c
index 6d3630d16271..92ebeca29901 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1688,6 +1688,14 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
1688 goto gso; 1688 goto gso;
1689 } 1689 }
1690 1690
1691 /*
1692 * If device doesnt need skb->dst, release it right now while
1693 * its hot in this cpu cache
1694 */
1695 if ((dev->priv_flags & IFF_XMIT_DST_RELEASE) && skb->dst) {
1696 dst_release(skb->dst);
1697 skb->dst = NULL;
1698 }
1691 rc = ops->ndo_start_xmit(skb, dev); 1699 rc = ops->ndo_start_xmit(skb, dev);
1692 /* 1700 /*
1693 * TODO: if skb_orphan() was called by 1701 * TODO: if skb_orphan() was called by
@@ -5045,6 +5053,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
5045 netdev_init_queues(dev); 5053 netdev_init_queues(dev);
5046 5054
5047 INIT_LIST_HEAD(&dev->napi_list); 5055 INIT_LIST_HEAD(&dev->napi_list);
5056 dev->priv_flags = IFF_XMIT_DST_RELEASE;
5048 setup(dev); 5057 setup(dev);
5049 strcpy(dev->name, name); 5058 strcpy(dev->name, name);
5050 return dev; 5059 return dev;