diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-03-23 01:17:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-23 01:17:25 -0800 |
| commit | b30bd282cbf5c46247a279a2e8d2aae027d9f1bf (patch) | |
| tree | 3426e213f156329a24707f7142ffcc54f6f69fbe | |
| parent | 1ae39a430b692552e5aceb63fa35ce95fcbadc6a (diff) | |
| download | linux-b30bd282cbf5c46247a279a2e8d2aae027d9f1bf.tar.gz | |
[IPV6]: ip6_xmit: remove unnecessary NULL ptr check
The sk argument to ip6_xmit is never NULL nowadays since the skb->priority
assigment expects a valid socket.
Coverity #354
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 4fbc40b13f1946..e46048974f37d2 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -161,7 +161,7 @@ int ip6_output(struct sk_buff *skb) int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, struct ipv6_txoptions *opt, int ipfragok) { - struct ipv6_pinfo *np = sk ? inet6_sk(sk) : NULL; + struct ipv6_pinfo *np = inet6_sk(sk); struct in6_addr *first_hop = &fl->fl6_dst; struct dst_entry *dst = skb->dst; struct ipv6hdr *hdr; |