[NET]: Get rid of netdev_nit
It isn't any faster to test a boolean global variable than do a simple check for empty list. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
42dc9cd54b
commit
9be9a6b983
@ -225,12 +225,6 @@ extern void netdev_unregister_sysfs(struct net_device *);
|
|||||||
|
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
/*
|
|
||||||
* For efficiency
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int netdev_nit;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Add a protocol ID to the list. Now that the input handler is
|
* Add a protocol ID to the list. Now that the input handler is
|
||||||
* smarter we can dispense with all the messy stuff that used to be
|
* smarter we can dispense with all the messy stuff that used to be
|
||||||
@ -265,10 +259,9 @@ void dev_add_pack(struct packet_type *pt)
|
|||||||
int hash;
|
int hash;
|
||||||
|
|
||||||
spin_lock_bh(&ptype_lock);
|
spin_lock_bh(&ptype_lock);
|
||||||
if (pt->type == htons(ETH_P_ALL)) {
|
if (pt->type == htons(ETH_P_ALL))
|
||||||
netdev_nit++;
|
|
||||||
list_add_rcu(&pt->list, &ptype_all);
|
list_add_rcu(&pt->list, &ptype_all);
|
||||||
} else {
|
else {
|
||||||
hash = ntohs(pt->type) & 15;
|
hash = ntohs(pt->type) & 15;
|
||||||
list_add_rcu(&pt->list, &ptype_base[hash]);
|
list_add_rcu(&pt->list, &ptype_base[hash]);
|
||||||
}
|
}
|
||||||
@ -295,10 +288,9 @@ void __dev_remove_pack(struct packet_type *pt)
|
|||||||
|
|
||||||
spin_lock_bh(&ptype_lock);
|
spin_lock_bh(&ptype_lock);
|
||||||
|
|
||||||
if (pt->type == htons(ETH_P_ALL)) {
|
if (pt->type == htons(ETH_P_ALL))
|
||||||
netdev_nit--;
|
|
||||||
head = &ptype_all;
|
head = &ptype_all;
|
||||||
} else
|
else
|
||||||
head = &ptype_base[ntohs(pt->type) & 15];
|
head = &ptype_base[ntohs(pt->type) & 15];
|
||||||
|
|
||||||
list_for_each_entry(pt1, head, list) {
|
list_for_each_entry(pt1, head, list) {
|
||||||
@ -1330,7 +1322,7 @@ static int dev_gso_segment(struct sk_buff *skb)
|
|||||||
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
{
|
{
|
||||||
if (likely(!skb->next)) {
|
if (likely(!skb->next)) {
|
||||||
if (netdev_nit)
|
if (!list_empty(&ptype_all))
|
||||||
dev_queue_xmit_nit(skb, dev);
|
dev_queue_xmit_nit(skb, dev);
|
||||||
|
|
||||||
if (netif_needs_gso(dev, skb)) {
|
if (netif_needs_gso(dev, skb)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user