Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Tue, 18 Mar 2008 07:37:55 +0000 (00:37 -0700)]
Conflicts:

drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c

21 files changed:
1  2 
Documentation/feature-removal-schedule.txt
Documentation/laptops/acer-wmi.txt
MAINTAINERS
drivers/net/wireless/ath5k/hw.c
drivers/net/wireless/libertas/cmdresp.c
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00lib.h
drivers/net/wireless/rt2x00/rt2x00rfkill.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
include/net/xfrm.h
net/8021q/vlan_dev.c
net/ipv4/af_inet.c
net/ipv4/ip_sockglue.c
net/ipv4/ipconfig.c
net/ipv4/tcp_output.c
net/sctp/input.c
net/sctp/ipv6.c
net/sctp/protocol.c
net/sctp/socket.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
@@@ -1151,20 -1311,9 +1149,10 @@@ int rt2x00lib_probe_dev(struct rt2x00_d
        }
  
        /*
-        * Register LED.
+        * Register extra components.
         */
 +      rt2x00leds_register(rt2x00dev);
-       /*
-        * Allocatie rfkill.
-        */
-       retval = rt2x00rfkill_allocate(rt2x00dev);
-       if (retval)
-               goto exit;
-       /*
-        * Open the debugfs entry.
-        */
+       rt2x00rfkill_allocate(rt2x00dev);
        rt2x00debug_register(rt2x00dev);
  
        __set_bit(DEVICE_PRESENT, &rt2x00dev->flags);
@@@ -1248,7 -1387,11 +1231,12 @@@ int rt2x00lib_suspend(struct rt2x00_de
         */
        rt2x00lib_stop(rt2x00dev);
        rt2x00lib_uninitialize(rt2x00dev);
+       /*
+        * Suspend/disable extra components.
+        */
 +      rt2x00leds_suspend(rt2x00dev);
+       rt2x00rfkill_suspend(rt2x00dev);
        rt2x00debug_deregister(rt2x00dev);
  
  exit:
@@@ -1292,10 -1414,10 +1280,11 @@@ int rt2x00lib_resume(struct rt2x00_dev 
        NOTICE(rt2x00dev, "Waking up.\n");
  
        /*
-        * Open the debugfs entry and restore led handling.
+        * Restore/enable extra components.
         */
        rt2x00debug_register(rt2x00dev);
+       rt2x00rfkill_resume(rt2x00dev);
 +      rt2x00leds_resume(rt2x00dev);
  
        /*
         * Only continue if mac80211 had open interfaces.
@@@ -170,38 -122,14 +170,46 @@@ static inline void rt2x00rfkill_allocat
  static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
  {
  }
+ static inline void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev)
+ {
+ }
+ static inline void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev)
+ {
+ }
  #endif /* CONFIG_RT2X00_LIB_RFKILL */
  
 +/*
 + * LED handlers
 + */
 +#ifdef CONFIG_RT2X00_LIB_LEDS
 +void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi);
 +void rt2x00leds_register(struct rt2x00_dev *rt2x00dev);
 +void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev);
 +void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev);
 +void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev);
 +#else
 +static inline void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev,
 +                                        int rssi)
 +{
 +}
 +
 +static inline void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
 +{
 +}
 +
 +static inline void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev)
 +{
 +}
 +
 +static inline void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev)
 +{
 +}
 +
 +static inline void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev)
 +{
 +}
 +#endif /* CONFIG_RT2X00_LIB_LEDS */
 +
  #endif /* RT2X00LIB_H */
Simple merge
Simple merge
Simple merge
@@@ -382,7 -382,7 +382,7 @@@ static int vlan_dev_hard_start_xmit(str
                vlan_dev_info(dev)->cnt_encap_on_xmit++;
  
                pr_debug("%s: proto to encap: 0x%hx\n",
-                        __func__, htons(veth->h_vlan_proto));
 -                       __FUNCTION__, ntohs(veth->h_vlan_proto));
++                       __func__, ntohs(veth->h_vlan_proto));
                /* Construct the second two bytes. This field looks something
                 * like:
                 * usr_priority: 3 bits  (high bits)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/sctp/ipv6.c
Simple merge
@@@ -628,10 -628,8 +628,11 @@@ static int sctp_inetaddr_event(struct n
        struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
        struct sctp_sockaddr_entry *addr = NULL;
        struct sctp_sockaddr_entry *temp;
+       int found = 0;
  
 +      if (ifa->ifa_dev->dev->nd_net != &init_net)
 +              return NOTIFY_DONE;
 +
        switch (ev) {
        case NETDEV_UP:
                addr = kmalloc(sizeof(struct sctp_sockaddr_entry), GFP_ATOMIC);
Simple merge