bluetooth: driver API update
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> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
43a67304a3
commit
b4d7f0a46b
@@ -55,12 +55,6 @@ static int bnep_net_close(struct net_device *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_device *dev)
|
||||
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 *skb, struct net_device *dev)
|
||||
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 *dev)
|
||||
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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user