diff options
| -rw-r--r-- | net/ipv4/netfilter/nf_reject_ipv4.c | 2 | ||||
| -rw-r--r-- | net/netfilter/nft_set_hash.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_reject_ipv4.c b/net/ipv4/netfilter/nf_reject_ipv4.c index eeacbdaf7cdf..5cd06ba3535d 100644 --- a/net/ipv4/netfilter/nf_reject_ipv4.c +++ b/net/ipv4/netfilter/nf_reject_ipv4.c | |||
| @@ -132,6 +132,8 @@ void nf_send_reset(struct net *net, struct sk_buff *oldskb, int hook) | |||
| 132 | if (ip_route_me_harder(net, nskb, RTN_UNSPEC)) | 132 | if (ip_route_me_harder(net, nskb, RTN_UNSPEC)) |
| 133 | goto free_nskb; | 133 | goto free_nskb; |
| 134 | 134 | ||
| 135 | niph = ip_hdr(nskb); | ||
| 136 | |||
| 135 | /* "Never happens" */ | 137 | /* "Never happens" */ |
| 136 | if (nskb->len > dst_mtu(skb_dst(nskb))) | 138 | if (nskb->len > dst_mtu(skb_dst(nskb))) |
| 137 | goto free_nskb; | 139 | goto free_nskb; |
diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c index 0fa01d772c5e..9c0d5a7ce5f9 100644 --- a/net/netfilter/nft_set_hash.c +++ b/net/netfilter/nft_set_hash.c | |||
| @@ -643,7 +643,6 @@ nft_hash_select_ops(const struct nft_ctx *ctx, const struct nft_set_desc *desc, | |||
| 643 | { | 643 | { |
| 644 | if (desc->size) { | 644 | if (desc->size) { |
| 645 | switch (desc->klen) { | 645 | switch (desc->klen) { |
| 646 | case 2: | ||
| 647 | case 4: | 646 | case 4: |
| 648 | return &nft_hash_fast_ops; | 647 | return &nft_hash_fast_ops; |
| 649 | default: | 648 | default: |
