diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-10-09 04:36:32 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:52:50 -0400 |
commit | 0c4e85813d0a94eeb8bf813397a4907bdd7bb610 (patch) | |
tree | 53ee948abc930bb1c5cd270c490f87fda5eb45b3 /drivers/net/pppoe.c | |
parent | 4c94f8c0c9a82fad84bc5df453aff755cfed70b7 (diff) |
[NET]: Wrap netdevice hardware header creation.
Add inline for common usage of hardware header creation, and
fix bug in IPV6 mcast where the assumption about negative return is
an errno. Negative return from hard_header means not enough space
was available,(ie -N bytes).
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pppoe.c')
-rw-r--r-- | drivers/net/pppoe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index d48b7b73d896..8936ed3469cf 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
@@ -834,8 +834,8 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
834 | } | 834 | } |
835 | 835 | ||
836 | error = total_len; | 836 | error = total_len; |
837 | dev->hard_header(skb, dev, ETH_P_PPP_SES, | 837 | dev_hard_header(skb, dev, ETH_P_PPP_SES, |
838 | po->pppoe_pa.remote, NULL, total_len); | 838 | po->pppoe_pa.remote, NULL, total_len); |
839 | 839 | ||
840 | memcpy(ph, &hdr, sizeof(struct pppoe_hdr)); | 840 | memcpy(ph, &hdr, sizeof(struct pppoe_hdr)); |
841 | 841 | ||
@@ -886,8 +886,8 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) | |||
886 | skb->protocol = __constant_htons(ETH_P_PPP_SES); | 886 | skb->protocol = __constant_htons(ETH_P_PPP_SES); |
887 | skb->dev = dev; | 887 | skb->dev = dev; |
888 | 888 | ||
889 | dev->hard_header(skb, dev, ETH_P_PPP_SES, | 889 | dev_hard_header(skb, dev, ETH_P_PPP_SES, |
890 | po->pppoe_pa.remote, NULL, data_len); | 890 | po->pppoe_pa.remote, NULL, data_len); |
891 | 891 | ||
892 | dev_queue_xmit(skb); | 892 | dev_queue_xmit(skb); |
893 | 893 | ||