diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-19 20:17:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-19 20:17:30 +0200 |
| commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
| tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /net/ax25 | |
| parent | net-tcp: Fast Open client - cookie-less mode (diff) | |
| parent | Merge tag 'md-3.5-fixes' of git://neil.brown.name/md (diff) | |
| download | linux-abaa72d7fd9a20a67b62e6afa0e746e27851dc33.tar.xz linux-abaa72d7fd9a20a67b62e6afa0e746e27851dc33.zip | |
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, case AX25_P_NETROM: if (ax25_protocol_is_registered(AX25_P_NETROM)) return -ESOCKTNOSUPPORT; + break; #endif #ifdef CONFIG_ROSE_MODULE case AX25_P_ROSE: |