Remove compat.diff usage

compat.diff is gone, we've moved to using anything
in the compat/diffs/*.patch. This simple piece is
now used to apply changes:

for i in compat/diffs/*.patch; do
        patch -p1 -N -t < $i
        RET=$?
        if [[ $RET -ne 0 ]]; then
                echo "Patching $i failed, update it"
                exit $RET
        fi
done

There are the current patches:

01-netdev.patch
02-ksize.patch
03-rfkill.patch
04-pcmcia.patch
05-netns.patch
06-usb.patch
07-header-changes.patch
08-change-default-rate-alg
09-zd1211rw-led.patch
98-add-compat-wireless.pat
99-change-makefiles.patch

Please keep 98 and 99 there. I'll send zd1211rw
stuff upstream now so that can be removed afterwards.

At all times we should try to minimize these hunks.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/compat/compat.diff b/compat/compat.diff
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 2719affde3dcb8b751e94d17cec53afd49533b8c..9d6ca561b79a9ca7869fb967ec407cc907046c6e 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -164,15 +164,6 @@ cp compat/compat-2.6.*.c net/wireless/
 cp compat/compat-2.6.*.h include/net/
 cp compat/compat.h include/net/
 
-# We'll remove this soon
-patch -p1 -N -t < compat/compat.diff
-RET=$?
-if [[ $RET -ne 0 ]]; then
-       echo "Patching compat.diff failed, update it"
-       exit $RET
-fi
-
-# This is the new way
 for i in compat/diffs/*.patch; do
        patch -p1 -N -t < $i
        RET=$?