diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
| commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
| tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /net/ax25 | |
| parent | 67da22d23fa6f3324e03bcd0580b914b2e4afbf3 (diff) | |
| parent | 3e4b9459fb0e149c6b74c9e89399a8fc39a92b44 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/af_ax25.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 051f7abae66d..779095ded689 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
| @@ -842,6 +842,7 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol, | |||
| 842 | case AX25_P_NETROM: | 842 | case AX25_P_NETROM: |
| 843 | if (ax25_protocol_is_registered(AX25_P_NETROM)) | 843 | if (ax25_protocol_is_registered(AX25_P_NETROM)) |
| 844 | return -ESOCKTNOSUPPORT; | 844 | return -ESOCKTNOSUPPORT; |
| 845 | break; | ||
| 845 | #endif | 846 | #endif |
| 846 | #ifdef CONFIG_ROSE_MODULE | 847 | #ifdef CONFIG_ROSE_MODULE |
| 847 | case AX25_P_ROSE: | 848 | case AX25_P_ROSE: |