diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /net/sctp/output.c | |
| parent | 42099d7a3941d4aaf853caac92b3ae76149fc6e7 (diff) | |
| parent | 2cc6d2bf3d6195fabcf0febc192c01f99519a8f3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'net/sctp/output.c')
| -rw-r--r-- | net/sctp/output.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index 901764b17aee..60600d337a3a 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c | |||
| @@ -94,7 +94,6 @@ struct sctp_packet *sctp_packet_config(struct sctp_packet *packet, | |||
| 94 | SCTP_DEBUG_PRINTK("%s: packet:%p vtag:0x%x\n", __func__, | 94 | SCTP_DEBUG_PRINTK("%s: packet:%p vtag:0x%x\n", __func__, |
| 95 | packet, vtag); | 95 | packet, vtag); |
| 96 | 96 | ||
| 97 | sctp_packet_reset(packet); | ||
| 98 | packet->vtag = vtag; | 97 | packet->vtag = vtag; |
| 99 | 98 | ||
| 100 | if (ecn_capable && sctp_packet_empty(packet)) { | 99 | if (ecn_capable && sctp_packet_empty(packet)) { |