From: "Nicolas de Pesloüan" <nicolas.2p.debian@gmail.com>
To: Jiri Pirko <jpirko@redhat.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net
Subject: Re: [patch net-next-2.6] net: remove the unnecessary dance around skb_bond_should_drop
Date: Sat, 12 Feb 2011 13:51:29 +0100 [thread overview]
Message-ID: <4D568251.7000305@gmail.com> (raw)
In-Reply-To: <20110212104605.GA2786@psychotron.redhat.com>
Le 12/02/2011 11:46, Jiri Pirko a écrit :
> No need to check (master) twice and to drive in and out the header file.
>
> Signed-off-by: Jiri Pirko<jpirko@redhat.com>
Reviewed-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
> ---
> include/linux/netdevice.h | 11 -----------
> net/core/dev.c | 6 +++---
> 2 files changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index c7d7074..5a5baea 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -2437,17 +2437,6 @@ static inline void netif_set_gso_max_size(struct net_device *dev,
> dev->gso_max_size = size;
> }
>
> -extern int __skb_bond_should_drop(struct sk_buff *skb,
> - struct net_device *master);
> -
> -static inline int skb_bond_should_drop(struct sk_buff *skb,
> - struct net_device *master)
> -{
> - if (master)
> - return __skb_bond_should_drop(skb, master);
> - return 0;
> -}
> -
> extern struct pernet_operations __net_initdata loopback_net_ops;
>
> static inline int dev_ethtool_get_settings(struct net_device *dev,
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 6392ea0..d874fd1 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -3105,7 +3105,8 @@ static inline void skb_bond_set_mac_by_master(struct sk_buff *skb,
> * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and
> * ARP on active-backup slaves with arp_validate enabled.
> */
> -int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master)
> +static int __skb_bond_should_drop(struct sk_buff *skb,
> + struct net_device *master)
> {
> struct net_device *dev = skb->dev;
>
> @@ -3139,7 +3140,6 @@ int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master)
> }
> return 0;
> }
> -EXPORT_SYMBOL(__skb_bond_should_drop);
>
> static int __netif_receive_skb(struct sk_buff *skb)
> {
> @@ -3177,7 +3177,7 @@ static int __netif_receive_skb(struct sk_buff *skb)
> if (skb->deliver_no_wcard)
> null_or_orig = orig_dev;
> else if (master) {
> - if (skb_bond_should_drop(skb, master)) {
> + if (__skb_bond_should_drop(skb, master)) {
> skb->deliver_no_wcard = 1;
> null_or_orig = orig_dev; /* deliver only exact match */
> } else
next prev parent reply other threads:[~2011-02-12 12:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-12 10:46 [patch net-next-2.6] net: remove the unnecessary dance around skb_bond_should_drop Jiri Pirko
2011-02-12 12:51 ` Nicolas de Pesloüan [this message]
2011-02-13 19:07 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D568251.7000305@gmail.com \
--to=nicolas.2p.debian@gmail.com \
--cc=davem@davemloft.net \
--cc=jpirko@redhat.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).