proskin's and wwood's patches.

This commit is contained in:
mark 2001-03-11 02:29:48 +00:00
parent 69eaf98163
commit 286380fcdd
12 changed files with 32 additions and 13 deletions

View File

@ -42,6 +42,11 @@
*
* --------------------------------------------------------------------
0.1.8
- wwoods's patches for 2.2.18 and adding bytes received to the
statistics.
- proskin's patch adding 'network stop'
- Most of proskin's patch containing Configure fixes, adding file
existence checks, and making sure directories are present.
- tgriffin's patch for mrproper/memleak/nullcheck/freeonsuccess.
conf.modules change is already there.
- Added most of jhicks ARM related patches. I had to leave out the

View File

@ -234,8 +234,6 @@ dump_str "WLAN_EXTRAVERSION=$WLAN_EXTRAVERSION"
if [ -r src/include/wlan/version.h ]; then
WLAN_RELEASE="${WLAN_VERSION}.${WLAN_PATCHLEVEL}.${WLAN_SUBLEVEL}${WLAN_EXTRAVERSION}"
OLD_RELEASE=`sed --quiet -e '/#define.*WLAN_RELEASE[^_].*\"\(.*\)\"/s//\1/p' < src/include/wlan/version.h`
echo ${WLAN_RELEASE}
echo ${OLD_RELEASE}
if [ "${WLAN_RELEASE}" != "${OLD_RELEASE}" ]; then
# Overwrite the file
mkversionh
@ -316,8 +314,10 @@ $ECHO ""
# PCMCIA Source dir
if [ ! "$PCMCIA_SRC" ] ; then
PCMCIA_SRC=`/sbin/cardctl -V 2>&1 | sed -e 's/cardctl version //'`
PCMCIA_SRC=/usr/src/pcmcia-cs-$PCMCIA_SRC
if [ -f /sbin/cardctl ] ; then
PCMCIA_SRC=`/sbin/cardctl -V 2>&1 | sed -e 's/cardctl version //'`
PCMCIA_SRC=/usr/src/pcmcia-cs-$PCMCIA_SRC
fi
fi
ask_str "pcmcia-cs source dir" PCMCIA_SRC

View File

@ -51,6 +51,7 @@ clean:
echo "Nothing to do"
install:
mkdir -p $(TARGET_PCMCIA_DIR) ; \
if [ -f $(TARGET_PCMCIA_DIR)/wlan-ng ]; then \
mv -f $(TARGET_PCMCIA_DIR)/wlan-ng $(TARGET_PCMCIA_DIR)/wlan-ng.O ; \
fi ; \
@ -64,15 +65,13 @@ install:
< ./wlan-ng.opts > $(TARGET_PCMCIA_DIR)/wlan-ng.opts; \
} ; \
if [ -f $(TARGET_PCMCIA_DIR)/wlan-ng.opts ]; then \
if grep -s WLAN_VERSION $(TARGET_PCMCIA_DIR)/wlan-ng.opts; then \
if grep -qs WLAN_VERSION $(TARGET_PCMCIA_DIR)/wlan-ng.opts; then \
mkver=$(WLAN_VERSION).$(WLAN_PATCHLEVEL).$(WLAN_SUBLEVEL)$(WLAN_EXTRAVERSION); \
eval `grep "WLAN_VERSION=" $(TARGET_PCMCIA_DIR)/wlan-ng.opts`; \
eval `grep "WLAN_PATCHLEVEL=" $(TARGET_PCMCIA_DIR)/wlan-ng.opts`; \
eval `grep "WLAN_SUBLEVEL=" $(TARGET_PCMCIA_DIR)/wlan-ng.opts`; \
eval `grep "WLAN_EXTRAVERSION=" $(TARGET_PCMCIA_DIR)/wlan-ng.opts`; \
oldver=$$WLAN_VERSION.$$WLAN_PATCHLEVEL.$$WLAN_SUBLEVEL$$WLAN_EXTRAVERSION; \
echo mkver= $$mkver; \
echo oldver= $$oldver; \
if [ $$mkver != $$oldver ]; then \
mv -f $(TARGET_PCMCIA_DIR)/wlan-ng.opts $(TARGET_PCMCIA_DIR)/wlan-ng.opts.O ; \
mkwlanopts ; \
@ -89,9 +88,11 @@ install:
mv -f $(TARGET_PCMCIA_DIR)/wlan-ng.conf $(TARGET_PCMCIA_DIR)/wlan-ng.conf.O ; \
fi ; \
cp wlan-ng.conf $(TARGET_PCMCIA_DIR) ; \
if [ -f $(TARGET_PCMCIA_DIR)/confog ]; then \
if ! grep -sq 'source.*\.\/\*\.conf$$' $(TARGET_PCMCIA_DIR)/config ; then \
if ! grep -sq 'source \.\/wlan-ng.conf' $(TARGET_PCMCIA_DIR)/config ; then \
mv -f $(TARGET_PCMCIA_DIR)/config $(TARGET_PCMCIA_DIR)/config.O ; \
( echo "source ./wlan-ng.conf"; cat $(TARGET_PCMCIA_DIR)/config.O) > $(TARGET_PCMCIA_DIR)/config ; \
fi ; \
fi
fi ; \
fi

View File

@ -257,7 +257,7 @@ case "$ACTION" in
'stop'|'suspend')
# ==========AP BRIDGE====================================
if is_true $IS_AP ; then
if is_true $IS_AP ; then if is_true $IS_BRIDGE; then
if is_true $IS_OLDBRIDGE; then
brcfg stop
ifconfig $APWIREDDEVICE down
@ -270,6 +270,11 @@ case "$ACTION" in
brctl delif $APBRIDGEDEVICE $DEVICE
brctl delbr $APBRIDGEDEVICE
fi
else
./network $1 $2
fi
else
./network $1 $2
fi
;;

View File

@ -64,7 +64,7 @@ clean:
install:
set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done
ifndef CROSS_COMPILE
ifdef INSTALL_DEPMOD
/sbin/depmod -a
endif

View File

@ -79,7 +79,7 @@ typedef struct net_device netdevice_t;
#endif
#ifndef _LINUX_K_COMPAT_H
#if (LINUX_VERSION_CODE < WLAN_KVERSION(2,3,1))
#if (LINUX_VERSION_CODE < WLAN_KVERSION(2,2,18)) || (LINUX_VERSION_CODE == WLAN_KVERSION(2,3,0))
#if (LINUX_VERSION_CODE < WLAN_KVERSION(2,0,16))
#define init_waitqueue_head(p) (*(p) = NULL)
#else

View File

@ -94,6 +94,7 @@ nwepgen: nwepgen.o
$(CC) -o nwepgen nwepgen.o
install:
mkdir -p $(TARGET_INST_EXEDIR)
cp nwepgen $(TARGET_INST_EXEDIR)
clean:

View File

@ -315,8 +315,10 @@ void p80211netdev_rx(wlandevice_t *wlandev, wlan_pb_t *pb)
pb->ethfree = NULL;
skb->dev = dev;
skb->protocol = eth_type_trans( skb, dev);
wlandev->linux_stats.rx_packets++;
netif_rx(skb);
wlandev->linux_stats.rx_packets++;
/* count only the packet payload */
wlandev->linux_stats.rx_bytes += skb->len;
} else {
WLAN_LOG_DEBUG0(1, "p80211_to_ether failed.\n");
}
@ -434,6 +436,8 @@ int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netdev)
goto failed;
}
wlandev->linux_stats.tx_packets++;
/* count only the packet payload */
wlandev->linux_stats.tx_bytes += skb->len;
txresult = (*(wlandev->txframe))(wlandev, pb);

View File

@ -100,6 +100,7 @@ prism2dl: $(OBJS)
$(CC) -g -o prism2dl $(OBJS)
install:
mkdir -p $(TARGET_INST_EXEDIR)
cp prism2dl $(TARGET_INST_EXEDIR)
clean:

View File

@ -158,7 +158,7 @@ $(AP_CS_MODULE) : $(AP_CS_OBJ)
install : $(MODULES)
mkdir -p $(TARGET_MODDIR)/pcmcia
cp $(MODULES) $(TARGET_MODDIR)/pcmcia
cp -f $(MODULES) $(TARGET_MODDIR)/pcmcia
mv $(TARGET_ROOT_ON_HOST)/etc/conf.modules \
$(TARGET_ROOT_ON_HOST)/etc/conf.modules.wlansave
grep -v prism2 $(TARGET_ROOT_ON_HOST)/etc/conf.modules.wlansave \

View File

@ -109,6 +109,7 @@ wlanctl: $(OBJS)
$(CC) -o wlanctl $(OBJS)
install:
mkdir -p $(TARGET_INST_EXEDIR)
cp wlanctl $(TARGET_INST_EXEDIR)/wlanctl-ng
clean:

View File

@ -107,6 +107,7 @@ wland: $(OBJS)
$(CC) -o wland $(OBJS)
install:
mkdir -p $(TARGET_INST_EXEDIR)
cp wland $(TARGET_INST_EXEDIR)/wland
clean: