Commit 2b4aa3ce authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

net: Remove dev_queue_xmit_sk

A function with weird arguments that it will never use to accomdate a
netfilter callback prototype is absolutely in the core of the
networking stack.  Frankly it does not make sense and it causes a lot
of confusion as to why arguments that are never used are being passed
to the function.

As I am preparing to make a second change to arguments to the okfn even
the names stops making sense.

As I have removed the two callers of this function remove this confusion
from the networking stack.

Signed-off-by: default avatar"Eric W. Biederman" <>
Signed-off-by: default avatarDavid S. Miller <>
parent 1f19c578
......@@ -2213,11 +2213,7 @@ int dev_close(struct net_device *dev);
int dev_close_many(struct list_head *head, bool unlink);
void dev_disable_lro(struct net_device *dev);
int dev_loopback_xmit(struct sock *sk, struct sk_buff *newskb);
int dev_queue_xmit_sk(struct sock *sk, struct sk_buff *skb);
static inline int dev_queue_xmit(struct sk_buff *skb)
return dev_queue_xmit_sk(skb->sk, skb);
int dev_queue_xmit(struct sk_buff *skb);
int dev_queue_xmit_accel(struct sk_buff *skb, void *accel_priv);
int register_netdevice(struct net_device *dev);
void unregister_netdevice_queue(struct net_device *dev, struct list_head *head);
......@@ -3143,11 +3143,11 @@ out:
return rc;
int dev_queue_xmit_sk(struct sock *sk, struct sk_buff *skb)
int dev_queue_xmit(struct sk_buff *skb)
return __dev_queue_xmit(skb, NULL);
int dev_queue_xmit_accel(struct sk_buff *skb, void *accel_priv)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment