qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

swconfig: Add generic switch identifiers

Browse Source 
Also make switches available under a generic name "switch<num>" for device
name agnostic access. The old device name is used as an alias for backward
compatibility.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27800 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jogo
2011-07-27 18:00:18 +00:00
parent 2ed51448ae
commit 6c853478d6
8 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/generic/files/drivers/net/phy/rtl8366rb.c
View File

@@ -1116,7 +1116,7 @@ static int rtl8366rb_switch_init(struct rtl8366_smi *smi)
dev->ports = RTL8366RB_NUM_PORTS;
dev->vlans = RTL8366RB_NUM_VIDS;
dev->ops = &rtl8366_ops;
dev->devname = dev_name(smi->parent);
dev->alias = dev_name(smi->parent);
err = register_switch(dev, NULL);
if (err)

2
target/linux/generic/files/drivers/net/phy/rtl8366s.c
View File

@@ -945,7 +945,7 @@ static int rtl8366s_switch_init(struct rtl8366_smi *smi)
dev->ports = RTL8366S_NUM_PORTS;
dev->vlans = RTL8366S_NUM_VIDS;
dev->ops = &rtl8366_ops;
dev->devname = dev_name(smi->parent);
dev->alias = dev_name(smi->parent);
err = register_switch(dev, NULL);
if (err)

35
target/linux/generic/files/drivers/net/phy/swconfig.c
View File

@@ -31,6 +31,8 @@
#define DPRINTF(...) do {} while(0)
#endif
#define SWCONFIG_DEVNAME "switch%d"
MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
MODULE_LICENSE("GPL");
@@ -760,8 +762,9 @@ swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
return -1;
NLA_PUT_U32(msg, SWITCH_ATTR_ID, dev->id);
NLA_PUT_STRING(msg, SWITCH_ATTR_NAME, dev->name);
NLA_PUT_STRING(msg, SWITCH_ATTR_DEV_NAME, dev->devname);
NLA_PUT_STRING(msg, SWITCH_ATTR_ALIAS, dev->alias);
NLA_PUT_STRING(msg, SWITCH_ATTR_NAME, dev->name);
NLA_PUT_U32(msg, SWITCH_ATTR_VLANS, dev->vlans);
NLA_PUT_U32(msg, SWITCH_ATTR_PORTS, dev->ports);
NLA_PUT_U32(msg, SWITCH_ATTR_CPU_PORT, dev->cpu_port);
@@ -857,13 +860,18 @@ static struct genl_ops swconfig_ops[] = {
int
register_switch(struct switch_dev *dev, struct net_device *netdev)
{
struct switch_dev *sdev;
const int max_switches = 8 * sizeof(unsigned long);
unsigned long in_use = 0;
int i;
INIT_LIST_HEAD(&dev->dev_list);
if (netdev) {
dev->netdev = netdev;
if (!dev->devname)
dev->devname = netdev->name;
if (!dev->alias)
dev->alias = netdev->name;
}
BUG_ON(!dev->devname);
BUG_ON(!dev->alias);
if (dev->ports > 0) {
dev->portbuf = kzalloc(sizeof(struct switch_port) * dev->ports,
@@ -871,10 +879,27 @@ register_switch(struct switch_dev *dev, struct net_device *netdev)
if (!dev->portbuf)
return -ENOMEM;
}
dev->id = ++swdev_id;
swconfig_defaults_init(dev);
spin_lock_init(&dev->lock);
swconfig_lock();
dev->id = ++swdev_id;
list_for_each_entry(sdev, &swdevs, dev_list) {
if (!sscanf(sdev->devname, SWCONFIG_DEVNAME, &i))
continue;
if (i < 0 || i > max_switches)
continue;
set_bit(i, &in_use);
}
i = find_first_zero_bit(&in_use, max_switches);
if (i == max_switches)
return -ENFILE;
/* fill device name */
snprintf(dev->devname, IFNAMSIZ, SWCONFIG_DEVNAME, i);
list_add(&dev->dev_list, &swdevs);
swconfig_unlock();

11
target/linux/generic/files/include/linux/switch.h
View File

@@ -36,8 +36,9 @@ enum {
SWITCH_ATTR_TYPE,
/* device */
SWITCH_ATTR_ID,
SWITCH_ATTR_NAME,
SWITCH_ATTR_DEV_NAME,
SWITCH_ATTR_ALIAS,
SWITCH_ATTR_NAME,
SWITCH_ATTR_VLANS,
SWITCH_ATTR_PORTS,
SWITCH_ATTR_CPU_PORT,
@@ -146,10 +147,12 @@ struct switch_dev_ops {
struct switch_dev {
const struct switch_dev_ops *ops;
const char *name;
/* will be automatically filled */
char devname[IFNAMSIZ];
/* NB: either devname or netdev must be set */
const char *devname;
const char *name;
/* NB: either alias or netdev must be set */
const char *alias;
struct net_device *netdev;
int ports;