diff options
| author | David S. Miller | 2008-04-14 11:30:23 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-04-14 11:30:23 +0200 |
| commit | df39e8ba56a788733d369068c7319e04b1da3cd5 (patch) | |
| tree | 1e9be853bdb455e341cdbf957656f342cfa2eb9e /include/net/sctp/command.h | |
| parent | [SKB]: __skb_queue_tail = __skb_insert before (diff) | |
| parent | [BRIDGE]: Fix crash in __ip_route_output_key with bridge netfilter (diff) | |
| download | kernel-qcow2-linux-df39e8ba56a788733d369068c7319e04b1da3cd5.tar.gz kernel-qcow2-linux-df39e8ba56a788733d369068c7319e04b1da3cd5.tar.xz kernel-qcow2-linux-df39e8ba56a788733d369068c7319e04b1da3cd5.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c
Diffstat (limited to 'include/net/sctp/command.h')
| -rw-r--r-- | include/net/sctp/command.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index 4263af857794..88988ab03d75 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h @@ -104,6 +104,7 @@ typedef enum { SCTP_CMD_ADAPTATION_IND, /* generate and send adaptation event */ SCTP_CMD_ASSOC_SHKEY, /* generate the association shared keys */ SCTP_CMD_T1_RETRAN, /* Mark for retransmission after T1 timeout */ + SCTP_CMD_UPDATE_INITTAG, /* Update peer inittag */ SCTP_CMD_LAST } sctp_verb_t; |