xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse Source 
r8152 conflicts are the NAPI fixes in 'net' overlapping with
some tasklet stuff in net-next

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2019-09-02 11:20:17 -07:00
parent 4bc61b0b16 089cf7f6ec
commit 765b7590c9
226 changed files with 2169 additions and 1074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/bridge/netfilter/nft_meta_bridge.c
View File

@@ -53,7 +53,7 @@ static void nft_meta_bridge_get_eval(const struct nft_expr *expr,
goto err;
br_vlan_get_proto(br_dev, &p_proto);
nft_reg_store16(dest, p_proto);
nft_reg_store16(dest, htons(p_proto));
return;
}
default: