Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1830fcea5bbed2719a9dc32aebe802f72ddf14ab

Authored by David Miller
Committed by David S. Miller
1 parent 3200392b88

net: Kill sock->sk_protinfo 

No more users, so it can now be removed.

Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 3 changed files with 0 additions and 9 deletions Side-by-side Diff

... ... @@ -277,7 +277,6 @@
277 277 * @sk_incoming_cpu: record cpu processing incoming packets
278 278 * @sk_txhash: computed flow hash for use on transmit
279 279 * @sk_filter: socket filtering instructions
280   - * @sk_protinfo: private area, net family specific, when not using slab
281 280 * @sk_timer: sock cleanup timer
282 281 * @sk_stamp: time stamp of last packet received
283 282 * @sk_tsflags: SO_TIMESTAMPING socket options
... ... @@ -416,7 +415,6 @@
416 415 const struct cred *sk_peer_cred;
417 416 long sk_rcvtimeo;
418 417 long sk_sndtimeo;
419   - void *sk_protinfo;
420 418 struct timer_list sk_timer;
421 419 ktime_t sk_stamp;
422 420 u16 sk_tsflags;
... ... @@ -2269,7 +2269,6 @@
2269 2269  
2270 2270 static void sock_def_destruct(struct sock *sk)
2271 2271 {
2272   - kfree(sk->sk_protinfo);
2273 2272 }
2274 2273  
2275 2274 void sk_send_sigurg(struct sock *sk)
... ... @@ -2121,12 +2121,6 @@
2121 2121 if (sp->subscribe.sctp_data_io_event)
2122 2122 sctp_ulpevent_read_sndrcvinfo(event, msg);
2123 2123  
2124   -#if 0
2125   - /* FIXME: we should be calling IP/IPv6 layers. */
2126   - if (sk->sk_protinfo.af_inet.cmsg_flags)
2127   - ip_cmsg_recv(msg, skb);
2128   -#endif
2129   -
2130 2124 err = copied;
2131 2125  
2132 2126 /* If skb's length exceeds the user's buffer, update the skb and