mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
b77f21c98a
Simplify cmake option handling by putting everything in blocks. Add openssl patch as there's no easy way to disable. Rebase the skip manpages patch. Remove the monitor mode patch as it no longer applies. Remove flex patch as normal Makefile is no longer used. Remove USB path patch. While it is deprecated, the codepath is never taken. /sys/bus/usb/devices is checked before hand. If it exists, the function does stuff and returns. Additionally, this path is used elsewhere in the code. Refresh other patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>
27 lines
479 B
Diff
27 lines
479 B
Diff
--- a/pcap-common.c
|
|
+++ b/pcap-common.c
|
|
@@ -1662,14 +1662,23 @@ swap_pseudo_headers(int linktype, struct
|
|
break;
|
|
|
|
case DLT_USB_LINUX:
|
|
+#ifndef PCAP_SUPPORT_USB
|
|
+ return;
|
|
+#endif
|
|
swap_linux_usb_header(hdr, data, 0);
|
|
break;
|
|
|
|
case DLT_USB_LINUX_MMAPPED:
|
|
+#ifndef PCAP_SUPPORT_USB
|
|
+ return;
|
|
+#endif
|
|
swap_linux_usb_header(hdr, data, 1);
|
|
break;
|
|
|
|
case DLT_NFLOG:
|
|
+#ifndef PCAP_SUPPORT_NETFILTER
|
|
+ return;
|
|
+#endif
|
|
swap_nflog_header(hdr, data);
|
|
break;
|
|
}
|