Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: mscan: too much data copied to CAN frame due to 16 bit accesses gro: refetch inet6_protos[] after pulling ext headers bnx2x: fix cl_id allocation for non-eth clients for NPAR mode mlx4_en: fix endianness with blue frame support
Showing
- drivers/net/bnx2x/bnx2x.h 12 additions, 6 deletionsdrivers/net/bnx2x/bnx2x.h
- drivers/net/bnx2x/bnx2x_cmn.h 1 addition, 1 deletiondrivers/net/bnx2x/bnx2x_cmn.h
- drivers/net/can/mscan/mscan.c 8 additions, 3 deletionsdrivers/net/can/mscan/mscan.c
- drivers/net/mlx4/en_tx.c 3 additions, 3 deletionsdrivers/net/mlx4/en_tx.c
- net/ipv6/af_inet6.c 1 addition, 0 deletionsnet/ipv6/af_inet6.c
Please register or sign in to comment