kernel: refresh patches
Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
This commit is contained in:
parent
a75ffc0bf3
commit
1708d26e3e
@ -26,7 +26,7 @@ Signed-off-by: jjm2473 <jjm2473@gmail.com>
|
||||
LEDSEL3 = 0x96,
|
||||
MAC0_BKP = 0x19e0,
|
||||
RSS_CTRL_8125 = 0x4500,
|
||||
@@ -5387,6 +5389,71 @@ static bool rtl_aspm_is_safe(struct rtl8
|
||||
@@ -5388,6 +5390,71 @@ static bool rtl_aspm_is_safe(struct rtl8
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -98,7 +98,7 @@ Signed-off-by: jjm2473 <jjm2473@gmail.com>
|
||||
static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
{
|
||||
const struct rtl_chip_info *chip;
|
||||
@@ -5568,6 +5635,11 @@ static int rtl_init_one(struct pci_dev *
|
||||
@@ -5569,6 +5636,11 @@ static int rtl_init_one(struct pci_dev *
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@ Subject: [PATCH] netfilter: nft_masq: supports brcm fullcone flag
|
||||
};
|
||||
|
||||
static int nft_masq_validate(const struct nft_ctx *ctx,
|
||||
@@ -51,6 +53,9 @@ static int nft_masq_init(const struct nf
|
||||
@@ -50,6 +52,9 @@ static int nft_masq_init(const struct nf
|
||||
if (tb[NFTA_MASQ_FLAGS])
|
||||
priv->flags = ntohl(nla_get_be32(tb[NFTA_MASQ_FLAGS]));
|
||||
|
||||
@ -53,7 +53,7 @@ Subject: [PATCH] netfilter: nft_masq: supports brcm fullcone flag
|
||||
if (tb[NFTA_MASQ_REG_PROTO_MIN]) {
|
||||
err = nft_parse_register_load(tb[NFTA_MASQ_REG_PROTO_MIN],
|
||||
&priv->sreg_proto_min, plen);
|
||||
@@ -80,6 +85,9 @@ static int nft_masq_dump(struct sk_buff
|
||||
@@ -79,6 +84,9 @@ static int nft_masq_dump(struct sk_buff
|
||||
nla_put_be32(skb, NFTA_MASQ_FLAGS, htonl(priv->flags)))
|
||||
goto nla_put_failure;
|
||||
|
||||
@ -63,7 +63,7 @@ Subject: [PATCH] netfilter: nft_masq: supports brcm fullcone flag
|
||||
if (priv->sreg_proto_min) {
|
||||
if (nft_dump_register(skb, NFTA_MASQ_REG_PROTO_MIN,
|
||||
priv->sreg_proto_min) ||
|
||||
@@ -112,6 +120,9 @@ static void nft_masq_eval(const struct n
|
||||
@@ -111,6 +119,9 @@ static void nft_masq_eval(const struct n
|
||||
|
||||
switch (nft_pf(pkt)) {
|
||||
case NFPROTO_IPV4:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user