diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-05 21:46:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-05 21:46:26 -0400 |
| commit | d247b6ab3ce6dd43665780865ec5fa145d9ab6bd (patch) | |
| tree | 02eb71e4d64b678d7568d2b99f309e08f56ef2fe /net/sctp | |
| parent | 30f00847953e3aa3f710d62ffd37b42042807900 (diff) | |
| parent | 4d8fdc95c60e90d84c8257a0067ff4b1729a3757 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/Makefile
net/ipv6/sysctl_net_ipv6.c
Two ipv6_table_template[] additions overlap, so the index
of the ipv6_table[x] assignments needed to be adjusted.
In the drivers/net/Makefile case, we've gotten rid of the
garbage whereby we had to list every single USB networking
driver in the top-level Makefile, there is just one
"USB_NETWORKING" that guards everything.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index 1eedba5195a3..42dffd428389 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c | |||
| @@ -599,7 +599,7 @@ out: | |||
| 599 | return err; | 599 | return err; |
| 600 | no_route: | 600 | no_route: |
| 601 | kfree_skb(nskb); | 601 | kfree_skb(nskb); |
| 602 | IP_INC_STATS_BH(sock_net(asoc->base.sk), IPSTATS_MIB_OUTNOROUTES); | 602 | IP_INC_STATS(sock_net(asoc->base.sk), IPSTATS_MIB_OUTNOROUTES); |
| 603 | 603 | ||
| 604 | /* FIXME: Returning the 'err' will effect all the associations | 604 | /* FIXME: Returning the 'err' will effect all the associations |
| 605 | * associated with a socket, although only one of the paths of the | 605 | * associated with a socket, although only one of the paths of the |