Browse Source

kernel: fix pkt_type filter mask for packet sockets

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 41178
Felix Fietkau 11 years ago
parent
commit
841b730f98

+ 1 - 1
package/kernel/mac80211/Makefile

@@ -1447,7 +1447,7 @@ endif
 config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_CRYPT_CCMP LIB80211_CRYPT_TKIP
 config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_CRYPT_CCMP LIB80211_CRYPT_TKIP
 
 
 config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
 config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
-config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG
+config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG ATH9K_TX99
 config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
 config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
 
 
 config-$(call config_package,ath9k) += ATH9K
 config-$(call config_package,ath9k) += ATH9K

+ 1 - 1
target/linux/generic/patches-3.10/630-packet_socket_type.patch

@@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +                        return -EINVAL;
 +                        return -EINVAL;
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                        return -EFAULT;
 +                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
 +                return 0;
 +                return 0;
 +        }
 +        }
  	default:
  	default:

+ 1 - 1
target/linux/generic/patches-3.12/630-packet_socket_type.patch

@@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +                        return -EINVAL;
 +                        return -EINVAL;
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                        return -EFAULT;
 +                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
 +                return 0;
 +                return 0;
 +        }
 +        }
  	default:
  	default:

+ 1 - 1
target/linux/generic/patches-3.13/630-packet_socket_type.patch

@@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +                        return -EINVAL;
 +                        return -EINVAL;
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                        return -EFAULT;
 +                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
 +                return 0;
 +                return 0;
 +        }
 +        }
  	default:
  	default:

+ 1 - 1
target/linux/generic/patches-3.14/630-packet_socket_type.patch

@@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +                        return -EINVAL;
 +                        return -EINVAL;
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                        return -EFAULT;
 +                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
 +                return 0;
 +                return 0;
 +        }
 +        }
  	default:
  	default:

+ 1 - 1
target/linux/generic/patches-3.3/630-packet_socket_type.patch

@@ -110,7 +110,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +                        return -EINVAL;
 +                        return -EINVAL;
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                        return -EFAULT;
 +                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
 +                return 0;
 +                return 0;
 +        }
 +        }
  	default:
  	default:

+ 1 - 1
target/linux/generic/patches-3.6/630-packet_socket_type.patch

@@ -110,7 +110,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +                        return -EINVAL;
 +                        return -EINVAL;
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                        return -EFAULT;
 +                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
 +                return 0;
 +                return 0;
 +        }
 +        }
  	default:
  	default:

+ 1 - 1
target/linux/generic/patches-3.8/630-packet_socket_type.patch

@@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +                        return -EINVAL;
 +                        return -EINVAL;
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                        return -EFAULT;
 +                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
 +                return 0;
 +                return 0;
 +        }
 +        }
  	default:
  	default:

+ 1 - 1
target/linux/generic/patches-3.9/630-packet_socket_type.patch

@@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +                        return -EINVAL;
 +                        return -EINVAL;
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                if (copy_from_user(&val, optval, sizeof(val)))
 +                        return -EFAULT;
 +                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
 +                return 0;
 +                return 0;
 +        }
 +        }
  	default:
  	default: