mac80211: re-enable re-transmission of filtered frames

[safe/jmp/linux-2.6] / include / linux / if_bonding.h

diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h
index 84598fa..cd525fa 100644 (file)
--- a/include/linux/if_bonding.h
+++ b/include/linux/if_bonding.h
@@ -85,7 +85,8 @@
 
 /* hashing types */
 #define BOND_XMIT_POLICY_LAYER2                0 /* layer 2 (MAC only), default */
-#define BOND_XMIT_POLICY_LAYER34       1 /* layer 3+4 (IP ^ MAC) */
+#define BOND_XMIT_POLICY_LAYER34       1 /* layer 3+4 (IP ^ (TCP || UDP)) */
+#define BOND_XMIT_POLICY_LAYER23       2 /* layer 2+3 (IP ^ MAC) */
 
 typedef struct ifbond {
        __s32 bond_mode;
@@ -93,8 +94,7 @@ typedef struct ifbond {
        __s32 miimon;
 } ifbond;
 
-typedef struct ifslave
-{
+typedef struct ifslave {
        __s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */
        char slave_name[IFNAMSIZ];
        __s8 link;