Skip to content

L
linux
Commit faf49a92 authored by Kai Germaschewski's avatar Kai Germaschewski
Browse files
Options

Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make 

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-net
parents a79b7643 c7165d9a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 1529 deletions
Makefile
View file @ faf49a92
......@@ -589,8 +589,9 @@ CLEAN_FILES += \
drivers/scsi/53c700_d.h drivers/scsi/sim710_d.h \
drivers/scsi/53c7xx_d.h drivers/scsi/53c7xx_u.h \
drivers/scsi/53c8xx_d.h drivers/scsi/53c8xx_u.h \
net/khttpd/make_times_h \
net/khttpd/times.h \
net/802/cl2llc.c net/802/transit/pdutr.h net/802/transit/timertr.h \
net/802/pseudo/pseudocode.h \
net/khttpd/make_times_h net/khttpd/times.h \
submenu*
# files removed with 'make mrproper'
......
drivers/block/genhd.c
View file @ faf49a92
......@@ -203,7 +203,6 @@ extern int blk_dev_init(void);
#ifdef CONFIG_FUSION
extern int fusion_init(void);
#endif
extern int net_dev_init(void);
extern int soc_probe(void);
extern int atmdev_init(void);
extern int i2o_init(void);
......@@ -227,9 +226,6 @@ int __init device_init(void)
#ifdef CONFIG_BLK_CPQ_DA
cpqarray_init();
#endif
#ifdef CONFIG_NET
net_dev_init();
#endif
#ifdef CONFIG_ATM
(void) atmdev_init();
#endif
......
net/802/Makefile
View file @ faf49a92
......@@ -2,52 +2,37 @@
# Makefile for the Linux 802.x protocol layers.
#
export-objs = llc_macinit.o p8022.o psnap.o
export-objs := llc_macinit.o p8022.o psnap.o
obj-y = p8023.o
obj-y := p8023.o
obj-$(CONFIG_SYSCTL) += sysctl_net_802.o
obj-$(CONFIG_LLC) += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
ifeq ($(CONFIG_SYSCTL),y)
obj-y += sysctl_net_802.o
endif
obj-$(CONFIG_SYSCTL) += sysctl_net_802.o
obj-$(CONFIG_LLC) += p8022.o psnap.o llc_sendpdu.o llc_utility.o \
cl2llc.o llc_macinit.o
obj-$(CONFIG_TR) += p8022.o psnap.o tr.o
obj-$(CONFIG_NET_FC) += fc.o
obj-$(CONFIG_FDDI) += fddi.o
obj-$(CONFIG_HIPPI) += hippi.o
obj-$(CONFIG_IPX) += p8022.o psnap.o
obj-$(CONFIG_ATALK) += p8022.o psnap.o
ifeq ($(CONFIG_LLC),y)
subdir-y += transit
obj-y += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
SNAP = y
endif
ifdef CONFIG_TR
obj-y += tr.o
SNAP=y
endif
ifdef CONFIG_NET_FC
obj-y += fc.o
endif
include $(TOPDIR)/Rules.make
ifdef CONFIG_FDDI
obj-y += fddi.o
endif
# Dependencies on generated files need to be listed explicitly
ifdef CONFIG_HIPPI
obj-y += hippi.o
endif
cl2llc.o: transit/pdutr.h transit/timertr.h pseudo/pseudocode.h
ifdef CONFIG_IPX
SNAP=y
endif
# Generated files
ifdef CONFIG_ATALK
SNAP=y
endif
transit/pdutr.h: transit/pdutr.pre transit/compile.awk
awk -f transit/compile.awk $< >$@
ifeq ($(SNAP),y)
obj-y += p8022.o psnap.o
endif
transit/timertr.h: transit/timertr.pre transit/compile.awk
awk -f transit/compile.awk $< >$@
include $(TOPDIR)/Rules.make
pseudo/pseudocode.h: pseudo/pseudocode pseudo/opcd2num.sed \
pseudo/compile.awk
sed -f pseudo/opcd2num.sed $< | awk -f pseudo/compile.awk >$@
cl2llc.c: cl2llc.pre
sed -f ./pseudo/opcd2num.sed cl2llc.pre >cl2llc.c
cl2llc.c: cl2llc.pre pseudo/opcd2num.sed
sed -f pseudo/opcd2num.sed $< >$@
net/802/cl2llc.c deleted 100644 → 0
View file @ a79b7643
This diff is collapsed.
net/802/cl2llc.pre
View file @ faf49a92
......@@ -96,7 +96,7 @@ int llc_data_request(llcptr lp, struct sk_buff *skb)
else
llc_interpret_pseudo_code(lp, REJECT1, skb, NO_FRAME);
break;
default:
default:;
}
if(lp->llc_callbacks)
{
......@@ -497,7 +497,7 @@ void llc_interpret_pseudo_code(llcptr lp, int pc_label, struct sk_buff *skb,
else
lp->f_flag = fr->i_hdr.i_pflag;
break;
default:
default:;
}
pc++;
}
......
net/802/pseudo/Makefile deleted 100644 → 0
View file @ a79b7643
all: pseudocode.h actionnm.h
clean:
touch pseudocode.h actionnm.h
rm pseudocode.h actionnm.h
pseudocode.h: pseudocode opcd2num.sed compile.awk
sed -f opcd2num.sed pseudocode | awk -f compile.awk >pseudocode.h
actionnm.h: pseudocode.h actionnm.awk
awk -f actionnm.awk pseudocode.h>actionnm.h
net/802/pseudo/actionnm.h deleted 100644 → 0
View file @ a79b7643
/* this file generated on Thu Oct 24 11:42:37 GMT 1996 */
static char *action_names[] = {
"NOP" ,"ADM1" ,"ADM2" ,"ADM3" ,
"ADM4" ,"ADM5" ,"CONN2" ,"CONN3" ,
"CONN4" ,"CONN5" ,"RESWAIT1" ,"RESWAIT2" ,
"RESWAIT3" ,"RESWAIT4" ,"RESWAIT5" ,"RESWAIT6" ,
"RESWAIT7" ,"RESWAIT8" ,"RESCHK1" ,"RESCHK2" ,
"RESCHK3" ,"RESCHK4" ,"RESCHK5" ,"RESCHK6" ,
"SETUP1" ,"SETUP2" ,"SETUP3" ,"SETUP4" ,
"SETUP5" ,"SETUP6" ,"SETUP7" ,"SETUP8" ,
"RESET1" ,"RESET2" ,"RESET3" ,"RESET4" ,
"RESET5" ,"RESET6" ,"RESET7" ,"RESET8" ,
"D_CONN1" ,"D_CONN2" ,"D_CONN3" ,"D_CONN4" ,
"D_CONN5" ,"D_CONN6" ,"D_CONN7" ,"ERR1" ,
"ERR2" ,"ERR3" ,"ERR4" ,"ERR5" ,
"ERR6" ,"ERR7" ,"ERR8" ,"SH1" ,
"SH2" ,"SH3" ,"SH4" ,"SH5" ,
"SH6" ,"SH7" ,"SH8" ,"SH9" ,
"SH10" ,"SH11" ,"NORMAL1" ,"NORMAL2" ,
"NORMAL3" ,"NORMAL4" ,"NORMAL5" ,"NORMAL6" ,
"NORMAL7" ,"NORMAL8A" ,"NORMAL8B" ,"NORMAL9" ,
"NORMAL10" ,"NORMAL11" ,"NORMAL12" ,"NORMAL13" ,
"NORMAL14" ,"NORMAL15" ,"NORMAL16" ,"NORMAL17" ,
"NORMAL18" ,"NORMAL19" ,"NORMAL20" ,"BUSY1" ,
"BUSY2" ,"BUSY3" ,"BUSY4" ,"BUSY5" ,
"BUSY6" ,"BUSY7" ,"BUSY8" ,"BUSY9" ,
"BUSY10" ,"BUSY11" ,"BUSY12" ,"BUSY13" ,
"BUSY14" ,"BUSY15" ,"BUSY16" ,"BUSY17" ,
"BUSY18" ,"BUSY19" ,"BUSY20" ,"BUSY21" ,
"BUSY22" ,"BUSY23" ,"BUSY24" ,"BUSY25" ,
"BUSY26" ,"REJECT1" ,"REJECT2" ,"REJECT3" ,
"REJECT4" ,"REJECT5" ,"REJECT6" ,"REJECT7" ,
"REJECT8" ,"REJECT9" ,"REJECT10" ,"REJECT11" ,
"REJECT12" ,"REJECT13" ,"REJECT14" ,"REJECT15" ,
"REJECT16" ,"REJECT17" ,"REJECT18" ,"REJECT19" ,
"REJECT20" ,"AWAIT1" ,"AWAIT2" ,"AWAIT3" ,
"AWAIT4" ,"AWAIT5" ,"AWAIT6" ,"AWAIT7" ,
"AWAIT8" ,"AWAIT9" ,"AWAIT10" ,"AWAIT11" ,
"AWAIT12" ,"AWAIT13" ,"AWAIT14" ,"AWAIT_BUSY1" ,
"AWAIT_BUSY2" ,"AWAIT_BUSY3" ,"AWAIT_BUSY4" ,"AWAIT_BUSY5" ,
"AWAIT_BUSY6" ,"AWAIT_BUSY7" ,"AWAIT_BUSY8" ,"AWAIT_BUSY9" ,
"AWAIT_BUSY10" ,"AWAIT_BUSY11" ,"AWAIT_BUSY12" ,"AWAIT_BUSY13" ,
"AWAIT_BUSY14" ,"AWAIT_BUSY15" ,"AWAIT_BUSY16" ,"AWAIT_REJECT1" ,
"AWAIT_REJECT2" ,"AWAIT_REJECT3" ,"AWAIT_REJECT4" ,"AWAIT_REJECT5" ,
"AWAIT_REJECT6" ,"AWAIT_REJECT7" ,"AWAIT_REJECT8" ,"AWAIT_REJECT9" ,
"AWAIT_REJECT10" ,"AWAIT_REJECT11" ,"AWAIT_REJECT12" ,"AWAIT_REJECT13" ,
0
};
net/802/pseudo/pseudocode.h deleted 100644 → 0
View file @ a79b7643
This diff is collapsed.
net/802/transit/Makefile deleted 100644 → 0
View file @ a79b7643
include $(TOPDIR)/Rules.make
all: pdutr.h timertr.h
pdutr.h: pdutr.pre compile.awk
awk -f ./compile.awk pdutr.pre > pdutr.h
timertr.h: timertr.pre compile.awk
awk -f ./compile.awk timertr.pre > timertr.h
clean:
touch pdutr.h timertr.h
rm pdutr.h timertr.h
net/802/transit/pdutr.h deleted 100644 → 0
View file @ a79b7643
This diff is collapsed.
net/802/transit/timertr.h deleted 100644 → 0
View file @ a79b7643
This diff is collapsed.
net/Makefile
View file @ faf49a92
......@@ -14,16 +14,8 @@ obj-y := socket.o core/
obj-$(CONFIG_NET) += ethernet/ 802/ sched/ netlink/
obj-$(CONFIG_INET) += ipv4/
obj-$(CONFIG_NETFILTER) += ipv4/netfilter/
obj-$(CONFIG_UNIX) += unix/
obj-$(CONFIG_IPV6) += ipv6/
ifneq ($(CONFIG_IPV6),n)
ifneq ($(CONFIG_IPV6),)
obj-$(CONFIG_NETFILTER) += ipv6/netfilter/
endif
endif
obj-$(CONFIG_KHTTPD) += khttpd/
obj-$(CONFIG_PACKET) += packet/
obj-$(CONFIG_NET_SCHED) += sched/
......
net/core/dev.c
View file @ faf49a92
......@@ -2427,7 +2427,7 @@ static int dev_boot_phase = 1;
* will not get the same name.
*/
int net_dev_init(void);
static int net_dev_init(void);
int register_netdevice(struct net_device *dev)
{
......@@ -2693,7 +2693,7 @@ extern void dv_init(void);
* Callers must hold the rtnl semaphore. See the comment at the
* end of Space.c for details about the locking.
*/
int __init net_dev_init(void)
static int __init net_dev_init(void)
{
struct net_device *dev, **dp;
int i;
......@@ -2834,6 +2834,8 @@ int __init net_dev_init(void)
return 0;
}
__initcall(net_dev_init);
#ifdef CONFIG_HOTPLUG
/* Notify userspace when a netdevice event occurs,
......
net/ipv4/Makefile
View file @ faf49a92
......@@ -18,5 +18,6 @@ obj-$(CONFIG_NET_IPIP) += ipip.o
obj-$(CONFIG_NET_IPGRE) += ip_gre.o
obj-$(CONFIG_SYN_COOKIES) += syncookies.o
obj-$(CONFIG_IP_PNP) += ipconfig.o
obj-$(CONFIG_NETFILTER) += netfilter/
include $(TOPDIR)/Rules.make
net/ipv6/Makefile
View file @ faf49a92
......@@ -13,5 +13,6 @@ ipv6-objs := af_inet6.o ip6_output.o ip6_input.o addrconf.o sit.o \
ip6_flowlabel.o ipv6_syms.o
#obj-$(CONFIG_IPV6_FIREWALL) += ip6_fw.o
obj-$(CONFIG_NETFILTER) += netfilter/
include $(TOPDIR)/Rules.make
net/khttpd/Makefile
View file @ faf49a92
......@@ -12,7 +12,11 @@ host-progs := make_times_h
include $(TOPDIR)/Rules.make
# Dependencies on generated files need to be listed explicitly
rfc_time.o: times.h
# Generated files
times.h: make_times_h
./make_times_h
./$< >$@
net/khttpd/make_times_h.c
View file @ faf49a92
......@@ -64,59 +64,52 @@ static int WeekGetDay(int D,int M,int Y)
int main(void)
{
int M,Y;
FILE *file;
file=fopen("times.h","w");
if (file==NULL)
return 0;
fprintf(file,"static time_t TimeDays[10][13] = { \n");
printf("static time_t TimeDays[10][13] = { \n");
Y=1997;
while (Y<2007)
{
M=0;
fprintf(file," { ");
printf(" { ");
while (M<12)
{
fprintf(file,"%i",(int)GetDay(1,M,Y));
fprintf(file,",\t");
printf("%i",(int)GetDay(1,M,Y));
printf(",\t");
M++;
}
fprintf(file,"%i } ",(int)GetDay(1,0,Y+1));
if (Y!=2006) fprintf(file,",");
fprintf(file,"\n");
printf("%i } ",(int)GetDay(1,0,Y+1));
if (Y!=2006) printf(",");
printf("\n");
Y++;
}
fprintf(file,"};\n");
printf("};\n");
fprintf(file,"static int WeekDays[10][13] = { \n");
printf("static int WeekDays[10][13] = { \n");
Y=1997;
while (Y<2007)
{
M=0;
fprintf(file," { ");
printf(" { ");
while (M<12)
{
fprintf(file,"%i",(int)WeekGetDay(1,M,Y));
fprintf(file,",\t");
printf("%i",(int)WeekGetDay(1,M,Y));
printf(",\t");
M++;
}
fprintf(file,"%i } ",(int)WeekGetDay(1,0,Y+1));
if (Y!=2006) fprintf(file,",");
fprintf(file,"\n");
printf("%i } ",(int)WeekGetDay(1,0,Y+1));
if (Y!=2006) printf(",");
printf("\n");
Y++;
}
fprintf(file,"};\n");
fprintf(file,"#define KHTTPD_YEAROFFSET 1997\n");
fprintf(file,"#define KHTTPD_NUMYEARS 10\n");
(void)fclose(file);
printf("};\n");
printf("#define KHTTPD_YEAROFFSET 1997\n");
printf("#define KHTTPD_NUMYEARS 10\n");
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7