projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.106' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
ipv4
/
ip_sockglue.c
diff --git
a/net/ipv4/ip_sockglue.c
b/net/ipv4/ip_sockglue.c
index a2ef76c45cd395e973ec4c17cd9c3bddadc956f1..3d009e17416656159f13144bdec9ca18512165a8 100644
(file)
--- a/
net/ipv4/ip_sockglue.c
+++ b/
net/ipv4/ip_sockglue.c
@@
-1049,7
+1049,7
@@
void ipv4_pktinfo_prepare(struct sk_buff *skb)
if (unlikely(IPCB(skb)->opt.optlen))
skb_dst_force(skb);
else
- skb_dst_drop(skb);
+
skb_dst_drop(skb);
}
int ip_setsockopt(struct sock *sk, int level,