diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-10 18:32:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-10 18:32:51 -0500 |
| commit | d4185bbf62a5d8d777ee445db1581beb17882a07 (patch) | |
| tree | 024b0badbd7c970b1983be6d8c345cc4a290cb31 /net/sctp/socket.c | |
| parent | c075b13098b399dc565b4d53f42047a8d40ed3ba (diff) | |
| parent | a375413311b39005ef281bfd71ae8f4e3df22e97 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net. Based upon a conflict resolution
patch posted by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index fa81bdee00a5..15379acd9c08 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -973,7 +973,7 @@ SCTP_STATIC int sctp_setsockopt_bindx(struct sock* sk, | |||
| 973 | void *addr_buf; | 973 | void *addr_buf; |
| 974 | struct sctp_af *af; | 974 | struct sctp_af *af; |
| 975 | 975 | ||
| 976 | SCTP_DEBUG_PRINTK("sctp_setsocktopt_bindx: sk %p addrs %p" | 976 | SCTP_DEBUG_PRINTK("sctp_setsockopt_bindx: sk %p addrs %p" |
| 977 | " addrs_size %d opt %d\n", sk, addrs, addrs_size, op); | 977 | " addrs_size %d opt %d\n", sk, addrs, addrs_size, op); |
| 978 | 978 | ||
| 979 | if (unlikely(addrs_size <= 0)) | 979 | if (unlikely(addrs_size <= 0)) |