X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Ffiles%2Finclude%2Flinux%2Fswitch.h;h=6eefb7fe6b0bb2ec93b0e2e323282bf7601e87cc;hb=HEAD;hp=ef2dc3ad9fe1de38a66346ab39025ba97d41aa51;hpb=7af90ad2ab393652904c4e3aded9a65ba896f793;p=openwrt-10.03%2F.git

diff --git a/target/linux/generic-2.6/files/include/linux/switch.h b/target/linux/generic-2.6/files/include/linux/switch.h
index ef2dc3ad9..6eefb7fe6 100644
--- a/target/linux/generic-2.6/files/include/linux/switch.h
+++ b/target/linux/generic-2.6/files/include/linux/switch.h
@@ -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;