r301 - in /unstable/madwifi/debian: changelog patches/00list patches/14_fix-2.6.24-inet-net-proc-net.dpatch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Wed Oct 17 21:42:56 2007
New Revision: 301

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=301
Log:
* Add 14_fix-2.6.24-inet-net-proc-net.dpatch to fix compilation on 2.6.24.

Added:
    unstable/madwifi/debian/patches/14_fix-2.6.24-inet-net-proc-net.dpatch
Modified:
    unstable/madwifi/debian/changelog
    unstable/madwifi/debian/patches/00list

Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=301&op=diff
==============================================================================
--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Wed Oct 17 21:42:56 2007
@@ -1,8 +1,9 @@
 madwifi (1:0.9.3.2-3) UNRELEASED; urgency=low
 
   * Add 13_fix-2.6.24-set-module-owner.dpatch to fix compilation on 2.6.24.
-
- -- Kel Modderman <kel at otaku42.de>  Wed, 17 Oct 2007 14:40:53 +1000
+  * Add 14_fix-2.6.24-inet-net-proc-net.dpatch to fix compilation on 2.6.24.
+
+ -- Kel Modderman <kel at otaku42.de>  Thu, 18 Oct 2007 07:42:21 +1000
 
 madwifi (1:0.9.3.2-2) unstable; urgency=high
 

Modified: unstable/madwifi/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/00list?rev=301&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/00list (original)
+++ unstable/madwifi/debian/patches/00list Wed Oct 17 21:42:56 2007
@@ -2,3 +2,4 @@
 11_mips-compile-flags-fix
 12_fix-2.6.23-include-fs-h
 13_fix-2.6.24-set-module-owner
+14_fix-2.6.24-inet-net-proc-net

Added: unstable/madwifi/debian/patches/14_fix-2.6.24-inet-net-proc-net.dpatch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/14_fix-2.6.24-inet-net-proc-net.dpatch?rev=301&op=file
==============================================================================
--- unstable/madwifi/debian/patches/14_fix-2.6.24-inet-net-proc-net.dpatch (added)
+++ unstable/madwifi/debian/patches/14_fix-2.6.24-inet-net-proc-net.dpatch Wed Oct 17 21:42:56 2007
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14_fix-2.6.24-inet-net-proc-net.dpatch by Kel Modderman <kel at otaku42.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://madwifi.org/changeset/2756
+
+ at DPATCH@
+diff -Nrup madwifi-0.9.3.2.orig/net80211/ieee80211_linux.c madwifi-0.9.3.2/net80211/ieee80211_linux.c
+--- madwifi-0.9.3.2.orig/net80211/ieee80211_linux.c	2007-03-07 15:30:05.000000000 +1000
++++ madwifi-0.9.3.2/net80211/ieee80211_linux.c	2007-10-18 07:36:03.000000000 +1000
+@@ -60,6 +60,10 @@
+ #include <net80211/ieee80211_var.h>
+ #include <net80211/ieee80211_monitor.h>
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
++#define proc_net init_net.proc_net
++#endif
++
+ /*
+  * Print a console message with the device name prepended.
+  */