mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Filling in the padding slot in the bpf structure as a bug fix in 'ne' overlapped with actually using that padding area for something in 'net-next'. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
9c54aeb03a
145 changed files with 1054 additions and 565 deletions
|
|
@ -208,7 +208,7 @@ err:
|
|||
static int ncsi_pkg_info_all_nl(struct sk_buff *skb,
|
||||
struct netlink_callback *cb)
|
||||
{
|
||||
struct nlattr *attrs[NCSI_ATTR_MAX];
|
||||
struct nlattr *attrs[NCSI_ATTR_MAX + 1];
|
||||
struct ncsi_package *np, *package;
|
||||
struct ncsi_dev_priv *ndp;
|
||||
unsigned int package_id;
|
||||
|
|
|
|||
Loading…
Reference in a new issue