diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-30 03:50:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-30 03:55:20 -0400 |
| commit | 58717686cf7c7f5a70b3a8907ade8a3ce74306b1 (patch) | |
| tree | 57f5d78524bfd5e65aa9f3943da9c1a3e6ff65b7 /drivers/isdn | |
| parent | cff63a52924c6a78fa525c67d81480c85736ff3c (diff) | |
| parent | 79f632c71bea0d0864d84d6a4ce78da5a9430f5b (diff) | |
| download | linux-58717686cf7c7f5a70b3a8907ade8a3ce74306b1.tar.gz linux-58717686cf7c7f5a70b3a8907ade8a3ce74306b1.tar.bz2 linux-58717686cf7c7f5a70b3a8907ade8a3ce74306b1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/emulex/benet/be.h
include/net/tcp.h
net/mac802154/mac802154.h
Most conflicts were minor overlapping stuff.
The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/mISDN/socket.c | 1 | ||||
| -rw-r--r-- | drivers/isdn/sc/init.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index 8b07f83d48ad..e47dcb9d1e91 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c @@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr, lock_sock(sk); *addr_len = sizeof(*maddr); + maddr->family = AF_ISDN; maddr->dev = _pms(sk)->dev->id; maddr->channel = _pms(sk)->ch.nr; maddr->sapi = _pms(sk)->ch.addr & 0xff; diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c index 6b580b2c717f..ca997bd4e818 100644 --- a/drivers/isdn/sc/init.c +++ b/drivers/isdn/sc/init.c @@ -33,8 +33,8 @@ static unsigned long ram[] = {0, 0, 0, 0}; static bool do_reset = 0; module_param_array(io, int, NULL, 0); -module_param_array(irq, int, NULL, 0); -module_param_array(ram, int, NULL, 0); +module_param_array(irq, byte, NULL, 0); +module_param_array(ram, long, NULL, 0); module_param(do_reset, bool, 0); static int identify_board(unsigned long, unsigned int); |