* [patch net-next-2.6] net: remove the unnecessary dance around skb_bond_should_drop
@ 2011-02-12 10:46 Jiri Pirko
2011-02-12 12:51 ` Nicolas de Pesloüan
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Pirko @ 2011-02-12 10:46 UTC (permalink / raw)
To: netdev; +Cc: davem
No need to check (master) twice and to drive in and out the header file.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
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
--
1.7.3.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch net-next-2.6] net: remove the unnecessary dance around skb_bond_should_drop
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
2011-02-13 19:07 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas de Pesloüan @ 2011-02-12 12:51 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch net-next-2.6] net: remove the unnecessary dance around skb_bond_should_drop
2011-02-12 12:51 ` Nicolas de Pesloüan
@ 2011-02-13 19:07 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2011-02-13 19:07 UTC (permalink / raw)
To: nicolas.2p.debian; +Cc: jpirko, netdev
From: Nicolas de Pesloüan <nicolas.2p.debian@gmail.com>
Date: Sat, 12 Feb 2011 13:51:29 +0100
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-13 19:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2011-02-13 19:07 ` David Miller
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).