[patch 2.6.9 11/11] vlan: Add MODULE_VERSION

From: John W. Linville (linville_at_tuxdriver.com)
Date: 10/20/04

  • Next message: Tim Cambrant: "Re: power/disk.c: small fixups"
    Date:	Wed, 20 Oct 2004 14:32:52 -0400
    To: netdev@oss.sgi.com, linux-kernel@vger.kernel.org, jgarzik@pobox.com, greearb@candelatech.com
    
    

    Add MODULE_VERSION to vlan driver.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>

    ---
     net/8021q/vlan.c |   10 ++++++----
     1 files changed, 6 insertions(+), 4 deletions(-)
    --- linux-2.6.9/net/8021q/vlan.c.orig
    +++ linux-2.6.9/net/8021q/vlan.c
    @@ -35,6 +35,8 @@
     #include "vlan.h"
     #include "vlanproc.h"
     
    +#define DRV_VERSION "1.8"
    +
     /* Global VLAN variables */
     
     /* Our listing of VLAN group(s) */
    @@ -42,8 +44,7 @@ struct hlist_head vlan_group_hash[VLAN_G
     #define vlan_grp_hashfn(IDX)	((((IDX) >> VLAN_GRP_HASH_SHIFT) ^ (IDX)) & VLAN_GRP_HASH_MASK)
     
     static char vlan_fullname[] = "802.1Q VLAN Support";
    -static unsigned int vlan_version = 1;
    -static unsigned int vlan_release = 8;
    +static char vlan_version[] = DRV_VERSION;
     static char vlan_copyright[] = "Ben Greear <greearb@candelatech.com>";
     static char vlan_buggyright[] = "David S. Miller <davem@redhat.com>";
     
    @@ -84,8 +85,8 @@ static int __init vlan_proto_init(void)
     {
     	int err;
     
    -	printk(VLAN_INF "%s v%u.%u %s\n",
    -	       vlan_fullname, vlan_version, vlan_release, vlan_copyright);
    +	printk(VLAN_INF "%s v%s %s\n",
    +	       vlan_fullname, vlan_version, vlan_copyright);
     	printk(VLAN_INF "All bugs added by %s\n",
     	       vlan_buggyright);
     
    @@ -735,3 +736,4 @@ static int vlan_ioctl_handler(void __use
     }
     
     MODULE_LICENSE("GPL");
    +MODULE_VERSION(DRV_VERSION);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at  http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at  http://www.tux.org/lkml/
    

  • Next message: Tim Cambrant: "Re: power/disk.c: small fixups"

    Relevant Pages

    • Re: ZyXEL GN650-T
      ... >> Later i will restart the server with the new kernel and i will tell you if ... > operation which is ok (i.e. networking without vlan for instance). ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: VLAN switching in linux kernel...
      ... >> linux kernel? ... you need to route them at Layer 3. ... Another options is to bridge between the two VLAN interfaces (eth0.200 ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: Kernel 2.8.6.1 & VLAN & E100
      ... > All except the kernel is stock FC2. ... > use VLAN subinterfaces. ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: Kernel 2.8.6.1 & VLAN & E100
      ... >> Everything works fine until I tried to enable VLAN ... >> use VLAN subinterfaces. ... Do you Yahoo!? ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: 2.6.9-rc1-mm5 bug in tcp_recvmsg?
      ... On Monday, September 13, 2004 3:36 pm, David S. Miller wrote: ... >> Shortly after the backtrace I've already posted, ... it was some buggy RCU locking in the VLAN code. ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)