summaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 17:39:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 17:39:53 -0700
commita4cfae13cef6a700a04b13ba1d819c0641b1b26f (patch)
tree91aa4f8be6df4494276d1a064d9f8f2b994aa367 /include/linux/netdevice.h
parentbe883da7594b0a2a02074e683673ae0e522566a4 (diff)
parentff7512e1a2a3504649d3716a757f43807b6d26ef (diff)
downloadop-kernel-dev-a4cfae13cef6a700a04b13ba1d819c0641b1b26f.zip
op-kernel-dev-a4cfae13cef6a700a04b13ba1d819c0641b1b26f.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [ATM]: fix broken uses of NIPQUAD in net/atm [SCTP]: sctp_unpack_cookie() fix [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG [NET]: Prevent multiple qdisc runs [CONNECTOR]: Initialize subsystem earlier. [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5e8e2d5..cead6be 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -232,6 +232,7 @@ enum netdev_state_t
__LINK_STATE_RX_SCHED,
__LINK_STATE_LINKWATCH_PENDING,
__LINK_STATE_DORMANT,
+ __LINK_STATE_QDISC_RUNNING,
};
OpenPOWER on IntegriCloud