git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[pandora-kernel.git]
/
net
/
ipv4
/
cipso_ipv4.c
diff --git
a/net/ipv4/cipso_ipv4.c
b/net/ipv4/cipso_ipv4.c
index
b0182aa
..
11a3404
100644
(file)
--- a/
net/ipv4/cipso_ipv4.c
+++ b/
net/ipv4/cipso_ipv4.c
@@
-1676,7
+1676,7
@@
validate_return:
*/
void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway)
{
- if (
skb->nh.iph
->protocol == IPPROTO_ICMP || error != -EACCES)
+ if (
ip_hdr(skb)
->protocol == IPPROTO_ICMP || error != -EACCES)
return;
if (gateway)