Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
index efcf1f9327e5..fd10d7c785d4 100644
--- a/drivers/isdn/i4l/isdn_x25iface.c
+++ b/drivers/isdn/i4l/isdn_x25iface.c
@@ -194,7 +194,7 @@ static int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb
         if ( ( (ix25_pdata_t*) (cprot->proto_data) ) 
              -> state == WAN_CONNECTED ){
                 if( skb_push(skb, 1)){
-                        skb -> data[0]=0x00;
+                        skb->data[0] = X25_IFACE_DATA;
                         skb->protocol = x25_type_trans(skb, cprot->net_dev);
                         netif_rx(skb);
                         return 0;
@@ -224,7 +224,7 @@ static int isdn_x25iface_connect_ind(struct concap_proto *cprot)
 
         skb = dev_alloc_skb(1);
         if( skb ){
-                *( skb_put(skb, 1) ) = 0x01;
+                *(skb_put(skb, 1)) = X25_IFACE_CONNECT;
                 skb->protocol = x25_type_trans(skb, cprot->net_dev);
                 netif_rx(skb);
                 return 0;
@@ -253,7 +253,7 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *cprot)
         *state_p = WAN_DISCONNECTED;
         skb = dev_alloc_skb(1);
         if( skb ){
-                *( skb_put(skb, 1) ) = 0x02;
+                *(skb_put(skb, 1)) = X25_IFACE_DISCONNECT;
                 skb->protocol = x25_type_trans(skb, cprot->net_dev);
                 netif_rx(skb);
                 return 0;
@@ -272,9 +272,10 @@ static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
         unsigned char firstbyte = skb->data[0];
         enum wan_states *state = &((ix25_pdata_t*)cprot->proto_data)->state;
         int ret = 0;
-        IX25DEBUG( "isdn_x25iface_xmit: %s first=%x state=%d \n", MY_DEVNAME(cprot -> net_dev), firstbyte, *state );
+        IX25DEBUG("isdn_x25iface_xmit: %s first=%x state=%d\n",
+                MY_DEVNAME(cprot->net_dev), firstbyte, *state);
         switch ( firstbyte ){
-        case 0x00: /* dl_data request */
+        case X25_IFACE_DATA:
                 if( *state == WAN_CONNECTED ){
                         skb_pull(skb, 1);
                         cprot -> net_dev -> trans_start = jiffies;
@@ -285,7 +286,7 @@ static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
                 }
                 illegal_state_warn( *state, firstbyte ); 
                 break;
-        case 0x01: /* dl_connect request */
+        case X25_IFACE_CONNECT:
                 if( *state == WAN_DISCONNECTED ){
                         *state = WAN_CONNECTING;
                         ret = cprot -> dops -> connect_req(cprot);
@@ -298,7 +299,7 @@ static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
                         illegal_state_warn( *state, firstbyte );
                 }
                 break;
-        case 0x02: /* dl_disconnect request */
+        case X25_IFACE_DISCONNECT:
                 switch ( *state ){
                 case WAN_DISCONNECTED: 
                         /* Should not happen. However, give upper layer a
@@ -318,7 +319,7 @@ static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
                         illegal_state_warn( *state, firstbyte );
                 }
                 break;
-        case 0x03: /* changing lapb parameters requested */
+        case X25_IFACE_PARAMS:
                 printk(KERN_WARNING "isdn_x25iface_xmit: setting of lapb"
                        " options not yet supported\n");
                 break;