vserver 1.9.5.x5

[linux-2.6.git] / net / 8021q / vlan_dev.c

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 79b0262..49c4874 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -1,4 +1,4 @@
-/*
+/* -*- linux-c -*-
  * INET                802.1Q VLAN
  *             Ethernet-type device handling.
  *
@@ -527,7 +527,7 @@ int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
 
        dev->mtu = new_mtu;
 
-       return new_mtu;
+       return 0;
 }
 
 int vlan_dev_set_ingress_priority(char *dev_name, __u32 skb_prio, short vlan_prio)
@@ -622,6 +622,44 @@ int vlan_dev_set_vlan_flag(char *dev_name, __u32 flag, short flag_val)
        return -EINVAL;
 }
 
+
+int vlan_dev_get_realdev_name(const char *dev_name, char* result)
+{
+       struct net_device *dev = dev_get_by_name(dev_name);
+       int rv = 0;
+       if (dev) {
+               if (dev->priv_flags & IFF_802_1Q_VLAN) {
+                       strncpy(result, VLAN_DEV_INFO(dev)->real_dev->name, 23);
+                       rv = 0;
+               } else {
+                       rv = -EINVAL;
+               }
+               dev_put(dev);
+       } else {
+               rv = -ENODEV;
+       }
+       return rv;
+}
+
+int vlan_dev_get_vid(const char *dev_name, unsigned short* result)
+{
+       struct net_device *dev = dev_get_by_name(dev_name);
+       int rv = 0;
+       if (dev) {
+               if (dev->priv_flags & IFF_802_1Q_VLAN) {
+                       *result = VLAN_DEV_INFO(dev)->vlan_id;
+                       rv = 0;
+               } else {
+                       rv = -EINVAL;
+               }
+               dev_put(dev);
+       } else {
+               rv = -ENODEV;
+       }
+       return rv;
+}
+
+
 int vlan_dev_set_mac_address(struct net_device *dev, void *addr_struct_p)
 {
        struct sockaddr *addr = (struct sockaddr *)(addr_struct_p);