From 8ae549702e126afcfb4f69449837803317394549 Mon Sep 17 00:00:00 2001 From: Neil Turton Date: Tue, 12 Feb 2008 23:13:48 -0800 Subject: [PATCH] --- yaml --- r: 85655 b: refs/heads/master c: d5bd0146f0d61f7dc9904a7cc6d5cb9832034de4 h: refs/heads/master i: 85653: 65f22785d90c3f6e2e56bfc76461d01602c59a3d 85651: 4ca9ed2d9e5d4aa6c06b6b489e3ae0018c647588 85647: 0f19b7badcb3184bf99bd0686c4f0844afae9d1f v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e3f142bfc165..42fae8755f07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8b2a4d21e0b37b9669b202867bfef19f68f786a +refs/heads/master: d5bd0146f0d61f7dc9904a7cc6d5cb9832034de4 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 047d432bde55..4ffa49dbb66f 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -604,6 +604,10 @@ struct net_device unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ + /* ingress path synchronizer */ + spinlock_t ingress_lock; + struct Qdisc *qdisc_ingress; + /* * Cache line mostly used on queue transmit path (qdisc) */ @@ -617,10 +621,6 @@ struct net_device /* Partially transmitted GSO packet. */ struct sk_buff *gso_skb; - /* ingress path synchronizer */ - spinlock_t ingress_lock; - struct Qdisc *qdisc_ingress; - /* * One part is mostly used on xmit path (device) */