Author: nbd Date: 2014-06-13 11:34:03 +0200 (Fri, 13 Jun 2014) New Revision: 41178
Modified: trunk/package/kernel/mac80211/Makefile trunk/target/linux/generic/patches-3.10/630-packet_socket_type.patch trunk/target/linux/generic/patches-3.12/630-packet_socket_type.patch trunk/target/linux/generic/patches-3.13/630-packet_socket_type.patch trunk/target/linux/generic/patches-3.14/630-packet_socket_type.patch trunk/target/linux/generic/patches-3.3/630-packet_socket_type.patch trunk/target/linux/generic/patches-3.6/630-packet_socket_type.patch trunk/target/linux/generic/patches-3.8/630-packet_socket_type.patch trunk/target/linux/generic/patches-3.9/630-packet_socket_type.patch Log: kernel: fix pkt_type filter mask for packet sockets Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/kernel/mac80211/Makefile =================================================================== --- trunk/package/kernel/mac80211/Makefile 2014-06-13 09:16:15 UTC (rev 41177) +++ trunk/package/kernel/mac80211/Makefile 2014-06-13 09:34:03 UTC (rev 41178) @@ -1447,7 +1447,7 @@ 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-$(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-$(call config_package,ath9k) += ATH9K Modified: trunk/target/linux/generic/patches-3.10/630-packet_socket_type.patch =================================================================== --- trunk/target/linux/generic/patches-3.10/630-packet_socket_type.patch 2014-06-13 09:16:15 UTC (rev 41177) +++ trunk/target/linux/generic/patches-3.10/630-packet_socket_type.patch 2014-06-13 09:34:03 UTC (rev 41178) @@ -102,7 +102,7 @@ + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: Modified: trunk/target/linux/generic/patches-3.12/630-packet_socket_type.patch =================================================================== --- trunk/target/linux/generic/patches-3.12/630-packet_socket_type.patch 2014-06-13 09:16:15 UTC (rev 41177) +++ trunk/target/linux/generic/patches-3.12/630-packet_socket_type.patch 2014-06-13 09:34:03 UTC (rev 41178) @@ -102,7 +102,7 @@ + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: Modified: trunk/target/linux/generic/patches-3.13/630-packet_socket_type.patch =================================================================== --- trunk/target/linux/generic/patches-3.13/630-packet_socket_type.patch 2014-06-13 09:16:15 UTC (rev 41177) +++ trunk/target/linux/generic/patches-3.13/630-packet_socket_type.patch 2014-06-13 09:34:03 UTC (rev 41178) @@ -102,7 +102,7 @@ + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: Modified: trunk/target/linux/generic/patches-3.14/630-packet_socket_type.patch =================================================================== --- trunk/target/linux/generic/patches-3.14/630-packet_socket_type.patch 2014-06-13 09:16:15 UTC (rev 41177) +++ trunk/target/linux/generic/patches-3.14/630-packet_socket_type.patch 2014-06-13 09:34:03 UTC (rev 41178) @@ -102,7 +102,7 @@ + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: Modified: trunk/target/linux/generic/patches-3.3/630-packet_socket_type.patch =================================================================== --- trunk/target/linux/generic/patches-3.3/630-packet_socket_type.patch 2014-06-13 09:16:15 UTC (rev 41177) +++ trunk/target/linux/generic/patches-3.3/630-packet_socket_type.patch 2014-06-13 09:34:03 UTC (rev 41178) @@ -110,7 +110,7 @@ + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: Modified: trunk/target/linux/generic/patches-3.6/630-packet_socket_type.patch =================================================================== --- trunk/target/linux/generic/patches-3.6/630-packet_socket_type.patch 2014-06-13 09:16:15 UTC (rev 41177) +++ trunk/target/linux/generic/patches-3.6/630-packet_socket_type.patch 2014-06-13 09:34:03 UTC (rev 41178) @@ -110,7 +110,7 @@ + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: Modified: trunk/target/linux/generic/patches-3.8/630-packet_socket_type.patch =================================================================== --- trunk/target/linux/generic/patches-3.8/630-packet_socket_type.patch 2014-06-13 09:16:15 UTC (rev 41177) +++ trunk/target/linux/generic/patches-3.8/630-packet_socket_type.patch 2014-06-13 09:34:03 UTC (rev 41178) @@ -102,7 +102,7 @@ + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: Modified: trunk/target/linux/generic/patches-3.9/630-packet_socket_type.patch =================================================================== --- trunk/target/linux/generic/patches-3.9/630-packet_socket_type.patch 2014-06-13 09:16:15 UTC (rev 41177) +++ trunk/target/linux/generic/patches-3.9/630-packet_socket_type.patch 2014-06-13 09:34:03 UTC (rev 41178) @@ -102,7 +102,7 @@ + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
