diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-10 15:04:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-10 15:04:35 -0700 |
| commit | 9bbc052d5e63512b0ce4e201ea97e12fba9fda82 (patch) | |
| tree | 30433e20961b73e571c081869d1ea52c92c7b15a /net/ipv6 | |
| parent | 0d4420a90b51abdea71585f571bad6d789ff8eb7 (diff) | |
| parent | 93bbce1ad0cd788190dd7d6c17d289f771fe3d0d (diff) | |
| download | linux-3.10-9bbc052d5e63512b0ce4e201ea97e12fba9fda82.tar.gz linux-3.10-9bbc052d5e63512b0ce4e201ea97e12fba9fda82.tar.bz2 linux-3.10-9bbc052d5e63512b0ce4e201ea97e12fba9fda82.zip | |
Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/ip6t_REJECT.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c index 28e74488a32..a5a4c5dd539 100644 --- a/net/ipv6/netfilter/ip6t_REJECT.c +++ b/net/ipv6/netfilter/ip6t_REJECT.c @@ -45,6 +45,8 @@ static void send_reset(struct net *net, struct sk_buff *oldskb) int tcphoff, needs_ack; const struct ipv6hdr *oip6h = ipv6_hdr(oldskb); struct ipv6hdr *ip6h; +#define DEFAULT_TOS_VALUE 0x0U + const __u8 tclass = DEFAULT_TOS_VALUE; struct dst_entry *dst = NULL; u8 proto; struct flowi6 fl6; @@ -124,7 +126,7 @@ static void send_reset(struct net *net, struct sk_buff *oldskb) skb_put(nskb, sizeof(struct ipv6hdr)); skb_reset_network_header(nskb); ip6h = ipv6_hdr(nskb); - ip6h->version = 6; + *(__be32 *)ip6h = htonl(0x60000000 | (tclass << 20)); ip6h->hop_limit = ip6_dst_hoplimit(dst); ip6h->nexthdr = IPPROTO_TCP; ipv6_addr_copy(&ip6h->saddr, &oip6h->daddr); |