From: Stephen Hemminger <shemminger@vyatta•com>
To: David Miller <davem@davemloft•net>, marcel@holtmann•org
Cc: netdev@vger•kernel.org, linux-bluetooth@vger•kernel.org
Subject: [PATCH 03/42] bluetooth: driver API update
Date: Tue, 06 Jan 2009 16:33:19 -0800 [thread overview]
Message-ID: <20090107003345.753201945@vyatta.com> (raw)
In-Reply-To: 20090107003316.784424362@vyatta.com
[-- Attachment #1: bluetooth.patch --]
[-- Type: text/plain, Size: 3912 bytes --]
Convert to net_device_ops and use internal net_device_stats in bnep
device.
Note: no need for bnep_net_ioctl since if ioctl is not set, then
dev_ifsioc handles it by returning -EOPNOTSUPP
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
---
net/bluetooth/bnep/bnep.h | 1 -
net/bluetooth/bnep/core.c | 12 ++++++------
net/bluetooth/bnep/netdev.c | 33 +++++++++++++--------------------
3 files changed, 19 insertions(+), 27 deletions(-)
--- a/net/bluetooth/bnep/bnep.h 2009-01-06 15:36:57.660614286 -0800
+++ b/net/bluetooth/bnep/bnep.h 2009-01-06 15:49:48.920360342 -0800
@@ -165,7 +165,6 @@ struct bnep_session {
struct socket *sock;
struct net_device *dev;
- struct net_device_stats stats;
};
void bnep_net_setup(struct net_device *dev);
--- a/net/bluetooth/bnep/netdev.c 2009-01-06 15:36:57.652614285 -0800
+++ b/net/bluetooth/bnep/netdev.c 2009-01-06 16:13:10.628360045 -0800
@@ -55,12 +55,6 @@ static int bnep_net_close(struct net_dev
return 0;
}
-static struct net_device_stats *bnep_net_get_stats(struct net_device *dev)
-{
- struct bnep_session *s = netdev_priv(dev);
- return &s->stats;
-}
-
static void bnep_net_set_mc_list(struct net_device *dev)
{
#ifdef CONFIG_BT_BNEP_MC_FILTER
@@ -128,11 +122,6 @@ static void bnep_net_timeout(struct net_
netif_wake_queue(dev);
}
-static int bnep_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
- return -EINVAL;
-}
-
#ifdef CONFIG_BT_BNEP_MC_FILTER
static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s)
{
@@ -217,6 +206,18 @@ static int bnep_net_xmit(struct sk_buff
return 0;
}
+static const struct net_device_ops bnep_netdev_ops = {
+ .ndo_open = bnep_net_open,
+ .ndo_stop = bnep_net_close,
+ .ndo_start_xmit = bnep_net_xmit,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_multicast_list = bnep_net_set_mc_list,
+ .ndo_set_mac_address = bnep_net_set_mac_addr,
+ .ndo_tx_timeout = bnep_net_timeout,
+ .ndo_change_mtu = eth_change_mtu,
+
+};
+
void bnep_net_setup(struct net_device *dev)
{
@@ -224,15 +225,7 @@ void bnep_net_setup(struct net_device *d
dev->addr_len = ETH_ALEN;
ether_setup(dev);
-
- dev->open = bnep_net_open;
- dev->stop = bnep_net_close;
- dev->hard_start_xmit = bnep_net_xmit;
- dev->get_stats = bnep_net_get_stats;
- dev->do_ioctl = bnep_net_ioctl;
- dev->set_mac_address = bnep_net_set_mac_addr;
- dev->set_multicast_list = bnep_net_set_mc_list;
+ dev->netdev_ops = &bnep_netdev_ops;
dev->watchdog_timeo = HZ * 2;
- dev->tx_timeout = bnep_net_timeout;
}
--- a/net/bluetooth/bnep/core.c 2009-01-06 15:36:57.668614314 -0800
+++ b/net/bluetooth/bnep/core.c 2009-01-06 15:49:48.920360342 -0800
@@ -306,7 +306,7 @@ static inline int bnep_rx_frame(struct b
struct sk_buff *nskb;
u8 type;
- s->stats.rx_bytes += skb->len;
+ dev->stats.rx_bytes += skb->len;
type = *(u8 *) skb->data; skb_pull(skb, 1);
@@ -343,7 +343,7 @@ static inline int bnep_rx_frame(struct b
* may not be modified and because of the alignment requirements. */
nskb = alloc_skb(2 + ETH_HLEN + skb->len, GFP_KERNEL);
if (!nskb) {
- s->stats.rx_dropped++;
+ dev->stats.rx_dropped++;
kfree_skb(skb);
return -ENOMEM;
}
@@ -378,14 +378,14 @@ static inline int bnep_rx_frame(struct b
skb_copy_from_linear_data(skb, __skb_put(nskb, skb->len), skb->len);
kfree_skb(skb);
- s->stats.rx_packets++;
+ dev->stats.rx_packets++;
nskb->ip_summed = CHECKSUM_NONE;
nskb->protocol = eth_type_trans(nskb, dev);
netif_rx_ni(nskb);
return 0;
badframe:
- s->stats.rx_errors++;
+ dev->stats.rx_errors++;
kfree_skb(skb);
return 0;
}
@@ -448,8 +448,8 @@ send:
kfree_skb(skb);
if (len > 0) {
- s->stats.tx_bytes += len;
- s->stats.tx_packets++;
+ s->dev->stats.tx_bytes += len;
+ s->dev->stats.tx_packets++;
return 0;
}
--
next prev parent reply other threads:[~2009-01-07 0:53 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-07 0:33 [PATCH 00/42] Still more net_device API updates Stephen Hemminger
2009-01-07 0:33 ` [PATCH 01/42] appletalk: convert aarp to net_device_ops Stephen Hemminger
2009-01-08 1:21 ` David Miller
2009-01-08 3:09 ` Joe Perches
2009-01-08 4:39 ` David Miller
2009-01-07 0:33 ` [PATCH 02/42] appletalk: convert ipddp " Stephen Hemminger
2009-01-08 1:22 ` David Miller
2009-01-07 0:33 ` Stephen Hemminger [this message]
[not found] ` <20090107003345.753201945-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-01-07 1:53 ` [PATCH 03/42] bluetooth: driver API update Marcel Holtmann
2009-01-08 1:23 ` David Miller
2009-01-07 0:33 ` [PATCH 05/42] cassini: update to net_device_ops Stephen Hemminger
2009-01-08 1:25 ` David Miller
2009-01-07 0:33 ` [PATCH 06/42] ipg: " Stephen Hemminger
2009-01-07 7:59 ` Pekka Enberg
2009-01-08 1:26 ` David Miller
2009-01-07 0:33 ` [PATCH 07/42] plip: " Stephen Hemminger
2009-01-08 1:26 ` David Miller
2009-01-07 0:33 ` [PATCH 08/42] tlan: " Stephen Hemminger
2009-01-08 1:27 ` David Miller
2009-01-07 0:33 ` [PATCH 09/42] epic100: " Stephen Hemminger
2009-01-08 1:27 ` David Miller
2009-01-07 0:33 ` [PATCH 10/42] sunhme: " Stephen Hemminger
2009-01-08 1:28 ` David Miller
2009-01-07 0:33 ` [PATCH 11/42] sungem: " Stephen Hemminger
2009-01-08 1:29 ` David Miller
2009-01-07 0:33 ` [PATCH 12/42] pcnet32: " Stephen Hemminger
2009-01-08 1:29 ` David Miller
2009-01-07 0:33 ` [PATCH 13/42] typhoon: " Stephen Hemminger
2009-01-08 1:29 ` David Miller
2009-01-07 0:33 ` [PATCH 14/42] enc28j60: " Stephen Hemminger
2009-01-08 1:30 ` David Miller
2009-01-07 0:33 ` [PATCH 16/42] de600: " Stephen Hemminger
2009-01-08 1:35 ` David Miller
2009-01-08 1:48 ` [PATCH 15/42] hp100: " Stephen Hemminger
2009-01-08 2:13 ` David Miller
2009-01-07 0:33 ` [PATCH 17/42] sis190: " Stephen Hemminger
2009-01-08 1:35 ` David Miller
2009-01-07 0:33 ` [PATCH 18/42] ns83820: fix net_device_ops support Stephen Hemminger
2009-01-08 1:36 ` David Miller
2009-01-07 0:33 ` [PATCH 19/42] sb1000: update to net_device_ops Stephen Hemminger
2009-01-08 1:57 ` David Miller
2009-01-07 0:33 ` [PATCH 20/42] natsemi: " Stephen Hemminger
2009-01-08 1:57 ` David Miller
2009-01-07 0:33 ` [PATCH 21/42] fealnx: " Stephen Hemminger
2009-01-08 1:57 ` David Miller
2009-01-07 0:33 ` [PATCH 22/42] starfire: " Stephen Hemminger
2009-01-08 1:58 ` David Miller
2009-01-07 0:33 ` [PATCH 23/42] sundance: " Stephen Hemminger
2009-01-08 1:58 ` David Miller
2009-01-07 0:33 ` [PATCH 24/42] tulip: convert devices to new API Stephen Hemminger
2009-01-07 7:49 ` Grant Grundler
2009-01-08 1:59 ` David Miller
2009-01-07 0:33 ` [PATCH 25/42] de2104x: convert to net_device_ops Stephen Hemminger
2009-01-07 7:50 ` Grant Grundler
2009-01-08 1:59 ` David Miller
2009-01-07 0:33 ` [PATCH 26/42] de4x5: " Stephen Hemminger
2009-01-08 2:00 ` David Miller
2009-01-07 0:33 ` [PATCH 27/42] xircom: convert devices to new API Stephen Hemminger
2009-01-08 2:01 ` David Miller
2009-01-07 0:33 ` [PATCH 28/42] dmfe: convert " Stephen Hemminger
2009-01-08 21:16 ` Grant Grundler
2009-01-08 21:32 ` David Miller
2009-01-07 0:33 ` [PATCH 29/42] uli526x: convert devices " Stephen Hemminger
2009-01-08 2:01 ` David Miller
2009-01-07 0:33 ` [PATCH 30/42] windbond: " Stephen Hemminger
2009-01-08 2:02 ` David Miller
2009-01-07 0:33 ` [PATCH 31/42] dvb: update network device to current API Stephen Hemminger
2009-01-08 2:02 ` David Miller
2009-01-07 0:33 ` [PATCH 32/42] hysdn: convert to net_device_ops and other updates Stephen Hemminger
2009-01-08 2:03 ` David Miller
2009-01-07 0:33 ` [PATCH 33/42] I4l: convert to net_device_ops Stephen Hemminger
2009-01-07 0:33 ` [PATCH 34/42] fusion: convert devices to new API Stephen Hemminger
2009-01-08 2:04 ` David Miller
2009-01-07 0:33 ` [PATCH 35/42] xpnet: " Stephen Hemminger
2009-01-08 2:05 ` David Miller
2009-01-07 0:33 ` [PATCH 36/42] gadget: " Stephen Hemminger
2009-01-08 2:05 ` David Miller
2009-01-07 0:33 ` [PATCH 37/42] synclink: " Stephen Hemminger
2009-01-07 23:48 ` [PATCH 37/42] synclink: convert devices to new API (rev2) Stephen Hemminger
2009-01-08 2:08 ` David Miller
2009-01-08 22:49 ` Krzysztof Halasa
2009-01-08 22:55 ` Krzysztof Halasa
2009-01-13 0:18 ` David Miller
2009-01-07 0:33 ` [PATCH 38/42] uwb: convert devices to net_device_ops Stephen Hemminger
2009-01-07 10:38 ` David Vrabel
2009-01-08 2:09 ` David Miller
2009-01-07 0:33 ` [PATCH 39/42] slip: convert " Stephen Hemminger
2009-01-08 2:09 ` David Miller
2009-01-07 0:33 ` [PATCH 40/42] amd8111e: " Stephen Hemminger
2009-01-08 2:10 ` David Miller
2009-01-07 0:33 ` [PATCH 41/42] atp: " Stephen Hemminger
2009-01-08 2:10 ` David Miller
2009-01-07 0:33 ` [PATCH 42/42] b44: " Stephen Hemminger
2009-01-08 2:10 ` David Miller
[not found] ` <20090107003345.872219054@vyatta.com>
2009-01-08 1:25 ` [PATCH 04/42] phonet: update " 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=20090107003345.753201945@vyatta.com \
--to=shemminger@vyatta$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-bluetooth@vger$(echo .)kernel.org \
--cc=marcel@holtmann$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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