Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9828
b: refs/heads/master
c: d000eaf
h: refs/heads/master
v: v3
  • Loading branch information
Harald Welte authored and David S. Miller committed Oct 11, 2005
1 parent 4b1907b commit cedd191
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b3a91d037a2575040f9b6a483f60c407a3d80368
refs/heads/master: d000eaf7720cb12cd03cd3d55f71be44357d27a9
3 changes: 2 additions & 1 deletion trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,8 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
static inline int
ctnetlink_change_status(struct ip_conntrack *ct, struct nfattr *cda[])
{
unsigned long d, status = *(u_int32_t *)NFA_DATA(cda[CTA_STATUS-1]);
unsigned long d;
unsigned status = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_STATUS-1]));
d = ct->status ^ status;

if (d & (IPS_EXPECTED|IPS_CONFIRMED|IPS_DYING))
Expand Down

0 comments on commit cedd191

Please sign in to comment.