From 6a9dffe176355c146dd1cfebfb809bfb684bf1a5 Mon Sep 17 00:00:00 2001 From: Roger James Date: Thu, 11 Apr 2013 00:32:31 +0100 Subject: [PATCH] Fix for issue #1987 The problem exists in the jmicron 1.0.8.5 source. The problem has been fixed in the vanilla kernel. This patch file appears to be generated by diffing the vanilla kernel source and the jmicron source, thus introducing the problem to the build. This changeset edits the patch file to remove the problem. This is not ideal as this fix will be easily lost if a new patch file is generated. The best solution would be to fix the problem in the original jmicron source. However this dpoes not appear to possible at the moment. --- .../linux/patches/3.8.7/linux-700-jmicron_1_0_8_5.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/linux/patches/3.8.7/linux-700-jmicron_1_0_8_5.patch b/packages/linux/patches/3.8.7/linux-700-jmicron_1_0_8_5.patch index 1d1c220af1..80a2c8195f 100644 --- a/packages/linux/patches/3.8.7/linux-700-jmicron_1_0_8_5.patch +++ b/packages/linux/patches/3.8.7/linux-700-jmicron_1_0_8_5.patch @@ -979,9 +979,9 @@ diff -Naur linux-3.7.2/drivers/net/ethernet/jme.c linux-3.7.2.patch/drivers/net/ .ndo_start_xmit = jme_start_xmit, .ndo_set_mac_address = jme_set_macaddr, - .ndo_set_rx_mode = jme_set_multi, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) -+ .ndo_set_multicast_list = jme_set_multi, -+#endif ++ .ndo_set_rx_mode = jme_set_multi, ++ ++ .ndo_change_mtu = jme_change_mtu, .ndo_tx_timeout = jme_tx_timeout, - .ndo_fix_features = jme_fix_features,