diff options
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 047d432bde55..a2f003239c85 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -322,7 +322,7 @@ enum | |||
322 | NAPI_STATE_DISABLE, /* Disable pending */ | 322 | NAPI_STATE_DISABLE, /* Disable pending */ |
323 | }; | 323 | }; |
324 | 324 | ||
325 | extern void FASTCALL(__napi_schedule(struct napi_struct *n)); | 325 | extern void __napi_schedule(struct napi_struct *n); |
326 | 326 | ||
327 | static inline int napi_disable_pending(struct napi_struct *n) | 327 | static inline int napi_disable_pending(struct napi_struct *n) |
328 | { | 328 | { |
@@ -604,6 +604,10 @@ struct net_device | |||
604 | 604 | ||
605 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ | 605 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ |
606 | 606 | ||
607 | /* ingress path synchronizer */ | ||
608 | spinlock_t ingress_lock; | ||
609 | struct Qdisc *qdisc_ingress; | ||
610 | |||
607 | /* | 611 | /* |
608 | * Cache line mostly used on queue transmit path (qdisc) | 612 | * Cache line mostly used on queue transmit path (qdisc) |
609 | */ | 613 | */ |
@@ -617,10 +621,6 @@ struct net_device | |||
617 | /* Partially transmitted GSO packet. */ | 621 | /* Partially transmitted GSO packet. */ |
618 | struct sk_buff *gso_skb; | 622 | struct sk_buff *gso_skb; |
619 | 623 | ||
620 | /* ingress path synchronizer */ | ||
621 | spinlock_t ingress_lock; | ||
622 | struct Qdisc *qdisc_ingress; | ||
623 | |||
624 | /* | 624 | /* |
625 | * One part is mostly used on xmit path (device) | 625 | * One part is mostly used on xmit path (device) |
626 | */ | 626 | */ |