diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:53 -0400 |
| commit | a4cfae13cef6a700a04b13ba1d819c0641b1b26f (patch) | |
| tree | 91aa4f8be6df4494276d1a064d9f8f2b994aa367 /include/linux | |
| parent | be883da7594b0a2a02074e683673ae0e522566a4 (diff) | |
| parent | ff7512e1a2a3504649d3716a757f43807b6d26ef (diff) | |
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')
| -rw-r--r-- | include/linux/netdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5e8e2d50429a..cead6be467ed 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -232,6 +232,7 @@ enum netdev_state_t | |||
| 232 | __LINK_STATE_RX_SCHED, | 232 | __LINK_STATE_RX_SCHED, |
| 233 | __LINK_STATE_LINKWATCH_PENDING, | 233 | __LINK_STATE_LINKWATCH_PENDING, |
| 234 | __LINK_STATE_DORMANT, | 234 | __LINK_STATE_DORMANT, |
| 235 | __LINK_STATE_QDISC_RUNNING, | ||
| 235 | }; | 236 | }; |
| 236 | 237 | ||
| 237 | 238 | ||