Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26851
b: refs/heads/master
c: d4e9dc6
h: refs/heads/master
i:
  26849: 67b9132
  26847: 84aa454
v: v3
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed May 21, 2006
1 parent 12fabb0 commit d6ee116
Show file tree
Hide file tree
Showing 2 changed files with 2 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: df88912a2165f56a7402db80126cf8ea075221fe
refs/heads/master: d4e9dc63dca91cd89086b5a686d7f7635c8319e5
2 changes: 1 addition & 1 deletion trunk/security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -3231,7 +3231,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
goto out;

/* Handle mapped IPv4 packets arriving via IPv6 sockets */
if (family == PF_INET6 && skb->protocol == ntohs(ETH_P_IP))
if (family == PF_INET6 && skb->protocol == htons(ETH_P_IP))
family = PF_INET;

read_lock_bh(&sk->sk_callback_lock);
Expand Down

0 comments on commit d6ee116

Please sign in to comment.