Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (170 commits) commit3d9dd7564d
Author: Zach Brown <zach.brown@oracle.com> Date: Fri Apr 14 16:04:18 2006 -0700 [PATCH] ip_output: account for fraggap when checking to add trailer_len During other work I noticed that ip_append_data() seemed to be forgetting to include the frag gap in its calculation of a fragment that consumes the rest of the payload. Herbert confirmed that this was a bug that snuck in during a previous rework. Signed-off-by: Zach Brown <zach.brown@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net> commit08d099974a
Author: Linus Walleij <triad@df.lth.se> Date: Fri Apr 14 16:03:33 2006 -0700 [IRDA]: smsc-ircc2, smcinit support for ALi ISA bridges ...
This commit is contained in:
commit
1b627d173e
166
Documentation/networking/xfrm_sync.txt
Normal file
166
Documentation/networking/xfrm_sync.txt
Normal file
@ -0,0 +1,166 @@
|
||||
|
||||
The sync patches work is based on initial patches from
|
||||
Krisztian <hidden@balabit.hu> and others and additional patches
|
||||
from Jamal <hadi@cyberus.ca>.
|
||||
|
||||
The end goal for syncing is to be able to insert attributes + generate
|
||||
events so that the an SA can be safely moved from one machine to another
|
||||
for HA purposes.
|
||||
The idea is to synchronize the SA so that the takeover machine can do
|
||||
the processing of the SA as accurate as possible if it has access to it.
|
||||
|
||||
We already have the ability to generate SA add/del/upd events.
|
||||
These patches add ability to sync and have accurate lifetime byte (to
|
||||
ensure proper decay of SAs) and replay counters to avoid replay attacks
|
||||
with as minimal loss at failover time.
|
||||
This way a backup stays as closely uptodate as an active member.
|
||||
|
||||
Because the above items change for every packet the SA receives,
|
||||
it is possible for a lot of the events to be generated.
|
||||
For this reason, we also add a nagle-like algorithm to restrict
|
||||
the events. i.e we are going to set thresholds to say "let me
|
||||
know if the replay sequence threshold is reached or 10 secs have passed"
|
||||
These thresholds are set system-wide via sysctls or can be updated
|
||||
per SA.
|
||||
|
||||
The identified items that need to be synchronized are:
|
||||
- the lifetime byte counter
|
||||
note that: lifetime time limit is not important if you assume the failover
|
||||
machine is known ahead of time since the decay of the time countdown
|
||||
is not driven by packet arrival.
|
||||
- the replay sequence for both inbound and outbound
|
||||
|
||||
1) Message Structure
|
||||
----------------------
|
||||
|
||||
nlmsghdr:aevent_id:optional-TLVs.
|
||||
|
||||
The netlink message types are:
|
||||
|
||||
XFRM_MSG_NEWAE and XFRM_MSG_GETAE.
|
||||
|
||||
A XFRM_MSG_GETAE does not have TLVs.
|
||||
A XFRM_MSG_NEWAE will have at least two TLVs (as is
|
||||
discussed further below).
|
||||
|
||||
aevent_id structure looks like:
|
||||
|
||||
struct xfrm_aevent_id {
|
||||
struct xfrm_usersa_id sa_id;
|
||||
__u32 flags;
|
||||
};
|
||||
|
||||
xfrm_usersa_id in this message layout identifies the SA.
|
||||
|
||||
flags are used to indicate different things. The possible
|
||||
flags are:
|
||||
XFRM_AE_RTHR=1, /* replay threshold*/
|
||||
XFRM_AE_RVAL=2, /* replay value */
|
||||
XFRM_AE_LVAL=4, /* lifetime value */
|
||||
XFRM_AE_ETHR=8, /* expiry timer threshold */
|
||||
XFRM_AE_CR=16, /* Event cause is replay update */
|
||||
XFRM_AE_CE=32, /* Event cause is timer expiry */
|
||||
XFRM_AE_CU=64, /* Event cause is policy update */
|
||||
|
||||
How these flags are used is dependent on the direction of the
|
||||
message (kernel<->user) as well the cause (config, query or event).
|
||||
This is described below in the different messages.
|
||||
|
||||
The pid will be set appropriately in netlink to recognize direction
|
||||
(0 to the kernel and pid = processid that created the event
|
||||
when going from kernel to user space)
|
||||
|
||||
A program needs to subscribe to multicast group XFRMNLGRP_AEVENTS
|
||||
to get notified of these events.
|
||||
|
||||
2) TLVS reflect the different parameters:
|
||||
-----------------------------------------
|
||||
|
||||
a) byte value (XFRMA_LTIME_VAL)
|
||||
This TLV carries the running/current counter for byte lifetime since
|
||||
last event.
|
||||
|
||||
b)replay value (XFRMA_REPLAY_VAL)
|
||||
This TLV carries the running/current counter for replay sequence since
|
||||
last event.
|
||||
|
||||
c)replay threshold (XFRMA_REPLAY_THRESH)
|
||||
This TLV carries the threshold being used by the kernel to trigger events
|
||||
when the replay sequence is exceeded.
|
||||
|
||||
d) expiry timer (XFRMA_ETIMER_THRESH)
|
||||
This is a timer value in milliseconds which is used as the nagle
|
||||
value to rate limit the events.
|
||||
|
||||
3) Default configurations for the parameters:
|
||||
----------------------------------------------
|
||||
|
||||
By default these events should be turned off unless there is
|
||||
at least one listener registered to listen to the multicast
|
||||
group XFRMNLGRP_AEVENTS.
|
||||
|
||||
Programs installing SAs will need to specify the two thresholds, however,
|
||||
in order to not change existing applications such as racoon
|
||||
we also provide default threshold values for these different parameters
|
||||
in case they are not specified.
|
||||
|
||||
the two sysctls/proc entries are:
|
||||
a) /proc/sys/net/core/sysctl_xfrm_aevent_etime
|
||||
used to provide default values for the XFRMA_ETIMER_THRESH in incremental
|
||||
units of time of 100ms. The default is 10 (1 second)
|
||||
|
||||
b) /proc/sys/net/core/sysctl_xfrm_aevent_rseqth
|
||||
used to provide default values for XFRMA_REPLAY_THRESH parameter
|
||||
in incremental packet count. The default is two packets.
|
||||
|
||||
4) Message types
|
||||
----------------
|
||||
|
||||
a) XFRM_MSG_GETAE issued by user-->kernel.
|
||||
XFRM_MSG_GETAE does not carry any TLVs.
|
||||
The response is a XFRM_MSG_NEWAE which is formatted based on what
|
||||
XFRM_MSG_GETAE queried for.
|
||||
The response will always have XFRMA_LTIME_VAL and XFRMA_REPLAY_VAL TLVs.
|
||||
*if XFRM_AE_RTHR flag is set, then XFRMA_REPLAY_THRESH is also retrieved
|
||||
*if XFRM_AE_ETHR flag is set, then XFRMA_ETIMER_THRESH is also retrieved
|
||||
|
||||
b) XFRM_MSG_NEWAE is issued by either user space to configure
|
||||
or kernel to announce events or respond to a XFRM_MSG_GETAE.
|
||||
|
||||
i) user --> kernel to configure a specific SA.
|
||||
any of the values or threshold parameters can be updated by passing the
|
||||
appropriate TLV.
|
||||
A response is issued back to the sender in user space to indicate success
|
||||
or failure.
|
||||
In the case of success, additionally an event with
|
||||
XFRM_MSG_NEWAE is also issued to any listeners as described in iii).
|
||||
|
||||
ii) kernel->user direction as a response to XFRM_MSG_GETAE
|
||||
The response will always have XFRMA_LTIME_VAL and XFRMA_REPLAY_VAL TLVs.
|
||||
The threshold TLVs will be included if explicitly requested in
|
||||
the XFRM_MSG_GETAE message.
|
||||
|
||||
iii) kernel->user to report as event if someone sets any values or
|
||||
thresholds for an SA using XFRM_MSG_NEWAE (as described in #i above).
|
||||
In such a case XFRM_AE_CU flag is set to inform the user that
|
||||
the change happened as a result of an update.
|
||||
The message will always have XFRMA_LTIME_VAL and XFRMA_REPLAY_VAL TLVs.
|
||||
|
||||
iv) kernel->user to report event when replay threshold or a timeout
|
||||
is exceeded.
|
||||
In such a case either XFRM_AE_CR (replay exceeded) or XFRM_AE_CE (timeout
|
||||
happened) is set to inform the user what happened.
|
||||
Note the two flags are mutually exclusive.
|
||||
The message will always have XFRMA_LTIME_VAL and XFRMA_REPLAY_VAL TLVs.
|
||||
|
||||
Exceptions to threshold settings
|
||||
--------------------------------
|
||||
|
||||
If you have an SA that is getting hit by traffic in bursts such that
|
||||
there is a period where the timer threshold expires with no packets
|
||||
seen, then an odd behavior is seen as follows:
|
||||
The first packet arrival after a timer expiry will trigger a timeout
|
||||
aevent; i.e we dont wait for a timeout period or a packet threshold
|
||||
to be reached. This is done for simplicity and efficiency reasons.
|
||||
|
||||
-JHS
|
@ -1815,14 +1815,14 @@ static int irda_usb_probe(struct usb_interface *intf,
|
||||
self->needspatch = (ret < 0);
|
||||
if (ret < 0) {
|
||||
printk("patch_device failed\n");
|
||||
goto err_out_4;
|
||||
goto err_out_5;
|
||||
}
|
||||
|
||||
/* replace IrDA class descriptor with what patched device is now reporting */
|
||||
irda_desc = irda_usb_find_class_desc (self->usbintf);
|
||||
if (irda_desc == NULL) {
|
||||
ret = -ENODEV;
|
||||
goto err_out_4;
|
||||
goto err_out_5;
|
||||
}
|
||||
if (self->irda_desc)
|
||||
kfree (self->irda_desc);
|
||||
@ -1832,6 +1832,8 @@ static int irda_usb_probe(struct usb_interface *intf,
|
||||
|
||||
return 0;
|
||||
|
||||
err_out_5:
|
||||
unregister_netdev(self->netdev);
|
||||
err_out_4:
|
||||
kfree(self->speed_buff);
|
||||
err_out_3:
|
||||
|
@ -225,6 +225,8 @@ static int __init smsc_superio_lpc(unsigned short cfg_base);
|
||||
#ifdef CONFIG_PCI
|
||||
static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuration *conf);
|
||||
static int __init preconfigure_through_82801(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
|
||||
static void __init preconfigure_ali_port(struct pci_dev *dev,
|
||||
unsigned short port);
|
||||
static int __init preconfigure_through_ali(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
|
||||
static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
|
||||
unsigned short ircc_fir,
|
||||
@ -2327,9 +2329,14 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)
|
||||
* pre-configuration not properly done by the BIOS (especially laptops)
|
||||
* This code is based in part on smcinit.c, tosh1800-smcinit.c
|
||||
* and tosh2450-smcinit.c. The table lists the device entries
|
||||
* for ISA bridges with an LPC (Local Peripheral Configurator)
|
||||
* that are in turn used to configure the SMSC device with default
|
||||
* SIR and FIR I/O ports, DMA and IRQ.
|
||||
* for ISA bridges with an LPC (Low Pin Count) controller which
|
||||
* handles the communication with the SMSC device. After the LPC
|
||||
* controller is initialized through PCI, the SMSC device is initialized
|
||||
* through a dedicated port in the ISA port-mapped I/O area, this latter
|
||||
* area is used to configure the SMSC device with default
|
||||
* SIR and FIR I/O ports, DMA and IRQ. Different vendors have
|
||||
* used different sets of parameters and different control port
|
||||
* addresses making a subsystem device table necessary.
|
||||
*/
|
||||
#ifdef CONFIG_PCI
|
||||
#define PCIID_VENDOR_INTEL 0x8086
|
||||
@ -2340,9 +2347,10 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __dev
|
||||
.device = 0x24cc,
|
||||
.subvendor = 0x103c,
|
||||
.subdevice = 0x088c,
|
||||
.sir_io = 0x02f8, /* Quite certain these are the same for nc8000 as for nc6000 */
|
||||
/* Quite certain these are the same for nc8000 as for nc6000 */
|
||||
.sir_io = 0x02f8,
|
||||
.fir_io = 0x0130,
|
||||
.fir_irq = 0x09,
|
||||
.fir_irq = 0x05,
|
||||
.fir_dma = 0x03,
|
||||
.cfg_base = 0x004e,
|
||||
.preconfigure = preconfigure_through_82801,
|
||||
@ -2355,60 +2363,79 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __dev
|
||||
.subdevice = 0x0890,
|
||||
.sir_io = 0x02f8,
|
||||
.fir_io = 0x0130,
|
||||
.fir_irq = 0x09,
|
||||
.fir_irq = 0x05,
|
||||
.fir_dma = 0x03,
|
||||
.cfg_base = 0x004e,
|
||||
.preconfigure = preconfigure_through_82801,
|
||||
.name = "HP nc6000",
|
||||
},
|
||||
{
|
||||
.vendor = PCIID_VENDOR_INTEL, /* Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge */
|
||||
/* Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge */
|
||||
.vendor = PCIID_VENDOR_INTEL,
|
||||
.device = 0x24c0,
|
||||
.subvendor = 0x1179,
|
||||
.subdevice = 0xffff, /* 0xffff is "any", Not sure, 0x0001 or 0x0002 */
|
||||
.subdevice = 0xffff, /* 0xffff is "any" */
|
||||
.sir_io = 0x03f8,
|
||||
.fir_io = 0x0130,
|
||||
.fir_irq = 0x07,
|
||||
.fir_dma = 0x01,
|
||||
.cfg_base = 0x002e,
|
||||
.preconfigure = preconfigure_through_82801,
|
||||
.name = "Toshiba Satellite 2450",
|
||||
.name = "Toshiba laptop with Intel 82801DB/DBL LPC bridge",
|
||||
},
|
||||
{
|
||||
.vendor = PCIID_VENDOR_INTEL, /* Intel 82801CAM ISA bridge */
|
||||
.device = 0x248c, /* Some use 24cc? */
|
||||
.device = 0x248c,
|
||||
.subvendor = 0x1179,
|
||||
.subdevice = 0xffff, /* 0xffff is "any", Not sure, 0x0001 or 0x0002 */
|
||||
.subdevice = 0xffff, /* 0xffff is "any" */
|
||||
.sir_io = 0x03f8,
|
||||
.fir_io = 0x0130,
|
||||
.fir_irq = 0x03,
|
||||
.fir_dma = 0x03,
|
||||
.cfg_base = 0x002e,
|
||||
.preconfigure = preconfigure_through_82801,
|
||||
.name = "Toshiba Satellite 5100/5200, Tecra 9100",
|
||||
.name = "Toshiba laptop with Intel 82801CAM ISA bridge",
|
||||
},
|
||||
{
|
||||
.vendor = PCIID_VENDOR_ALI, /* ALi M1533/M1535 PCI to ISA Bridge [Aladdin IV/V/V+] */
|
||||
/* 82801DBM (ICH4-M) LPC Interface Bridge */
|
||||
.vendor = PCIID_VENDOR_INTEL,
|
||||
.device = 0x24cc,
|
||||
.subvendor = 0x1179,
|
||||
.subdevice = 0xffff, /* 0xffff is "any" */
|
||||
.sir_io = 0x03f8,
|
||||
.fir_io = 0x0130,
|
||||
.fir_irq = 0x03,
|
||||
.fir_dma = 0x03,
|
||||
.cfg_base = 0x002e,
|
||||
.preconfigure = preconfigure_through_82801,
|
||||
.name = "Toshiba laptop with Intel 8281DBM LPC bridge",
|
||||
},
|
||||
{
|
||||
/* ALi M1533/M1535 PCI to ISA Bridge [Aladdin IV/V/V+] */
|
||||
.vendor = PCIID_VENDOR_ALI,
|
||||
.device = 0x1533,
|
||||
.subvendor = 0x1179,
|
||||
.subdevice = 0xffff, /* 0xffff is "any", Not sure, 0x0001 or 0x0002 */
|
||||
.subdevice = 0xffff, /* 0xffff is "any" */
|
||||
.sir_io = 0x02e8,
|
||||
.fir_io = 0x02f8,
|
||||
.fir_irq = 0x07,
|
||||
.fir_dma = 0x03,
|
||||
.cfg_base = 0x002e,
|
||||
.preconfigure = preconfigure_through_ali,
|
||||
.name = "Toshiba Satellite 1800",
|
||||
.name = "Toshiba laptop with ALi ISA bridge",
|
||||
},
|
||||
{ } // Terminator
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* This sets up the basic SMSC parameters (FIR port, SIR port, FIR DMA, FIR IRQ)
|
||||
* This sets up the basic SMSC parameters
|
||||
* (FIR port, SIR port, FIR DMA, FIR IRQ)
|
||||
* through the chip configuration port.
|
||||
*/
|
||||
static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuration *conf)
|
||||
static int __init preconfigure_smsc_chip(struct
|
||||
smsc_ircc_subsystem_configuration
|
||||
*conf)
|
||||
{
|
||||
unsigned short iobase = conf->cfg_base;
|
||||
unsigned char tmpbyte;
|
||||
@ -2416,7 +2443,9 @@ static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuratio
|
||||
outb(LPC47N227_CFGACCESSKEY, iobase); // enter configuration state
|
||||
outb(SMSCSIOFLAT_DEVICEID_REG, iobase); // set for device ID
|
||||
tmpbyte = inb(iobase +1); // Read device ID
|
||||
IRDA_DEBUG(0, "Detected Chip id: 0x%02x, setting up registers...\n",tmpbyte);
|
||||
IRDA_DEBUG(0,
|
||||
"Detected Chip id: 0x%02x, setting up registers...\n",
|
||||
tmpbyte);
|
||||
|
||||
/* Disable UART1 and set up SIR I/O port */
|
||||
outb(0x24, iobase); // select CR24 - UART1 base addr
|
||||
@ -2426,6 +2455,7 @@ static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuratio
|
||||
tmpbyte = inb(iobase + 1);
|
||||
if (tmpbyte != (conf->sir_io >> 2) ) {
|
||||
IRDA_WARNING("ERROR: could not configure SIR ioport.\n");
|
||||
IRDA_WARNING("Try to supply ircc_cfg argument.\n");
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
@ -2461,7 +2491,8 @@ static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuratio
|
||||
|
||||
outb(SMSCSIOFLAT_UARTMODE0C_REG, iobase); // CR0C - UART mode
|
||||
tmpbyte = inb(iobase + 1);
|
||||
tmpbyte &= ~SMSCSIOFLAT_UART2MODE_MASK | SMSCSIOFLAT_UART2MODE_VAL_IRDA;
|
||||
tmpbyte &= ~SMSCSIOFLAT_UART2MODE_MASK |
|
||||
SMSCSIOFLAT_UART2MODE_VAL_IRDA;
|
||||
outb(tmpbyte, iobase + 1); // enable IrDA (HPSIR) mode, high speed
|
||||
|
||||
outb(LPC47N227_APMBOOTDRIVE_REG, iobase); // CR07 - Auto Pwr Mgt/boot drive sel
|
||||
@ -2486,53 +2517,226 @@ static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuratio
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 82801CAM registers */
|
||||
/* 82801CAM generic registers */
|
||||
#define VID 0x00
|
||||
#define DID 0x02
|
||||
#define PIRQA_ROUT 0x60
|
||||
#define PIRQ_A_D_ROUT 0x60
|
||||
#define SIRQ_CNTL 0x64
|
||||
#define PIRQ_E_H_ROUT 0x68
|
||||
#define PCI_DMA_C 0x90
|
||||
/* LPC-specific registers */
|
||||
#define COM_DEC 0xe0
|
||||
#define GEN1_DEC 0xe4
|
||||
#define LPC_EN 0xe6
|
||||
#define GEN2_DEC 0xec
|
||||
/*
|
||||
* Sets up the I/O range using the 82801CAM ISA bridge, 82801DBM LPC bridge or
|
||||
* Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge. They all work the same way!
|
||||
* Sets up the I/O range using the 82801CAM ISA bridge, 82801DBM LPC bridge
|
||||
* or Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge.
|
||||
* They all work the same way!
|
||||
*/
|
||||
static int __init preconfigure_through_82801(struct pci_dev *dev,
|
||||
struct smsc_ircc_subsystem_configuration *conf)
|
||||
struct
|
||||
smsc_ircc_subsystem_configuration
|
||||
*conf)
|
||||
{
|
||||
unsigned short tmpword;
|
||||
int ret;
|
||||
unsigned char tmpbyte;
|
||||
|
||||
IRDA_MESSAGE("Setting up the SMSC device via the 82801 controller.\n");
|
||||
pci_write_config_byte(dev, COM_DEC, 0x10);
|
||||
IRDA_MESSAGE("Setting up Intel 82801 controller and SMSC device\n");
|
||||
/*
|
||||
* Select the range for the COMA COM port (SIR)
|
||||
* Register COM_DEC:
|
||||
* Bit 7: reserved
|
||||
* Bit 6-4, COMB decode range
|
||||
* Bit 3: reserved
|
||||
* Bit 2-0, COMA decode range
|
||||
*
|
||||
* Decode ranges:
|
||||
* 000 = 0x3f8-0x3ff (COM1)
|
||||
* 001 = 0x2f8-0x2ff (COM2)
|
||||
* 010 = 0x220-0x227
|
||||
* 011 = 0x228-0x22f
|
||||
* 100 = 0x238-0x23f
|
||||
* 101 = 0x2e8-0x2ef (COM4)
|
||||
* 110 = 0x338-0x33f
|
||||
* 111 = 0x3e8-0x3ef (COM3)
|
||||
*/
|
||||
pci_read_config_byte(dev, COM_DEC, &tmpbyte);
|
||||
tmpbyte &= 0xf8; /* mask COMA bits */
|
||||
switch(conf->sir_io) {
|
||||
case 0x3f8:
|
||||
tmpbyte |= 0x00;
|
||||
break;
|
||||
case 0x2f8:
|
||||
tmpbyte |= 0x01;
|
||||
break;
|
||||
case 0x220:
|
||||
tmpbyte |= 0x02;
|
||||
break;
|
||||
case 0x228:
|
||||
tmpbyte |= 0x03;
|
||||
break;
|
||||
case 0x238:
|
||||
tmpbyte |= 0x04;
|
||||
break;
|
||||
case 0x2e8:
|
||||
tmpbyte |= 0x05;
|
||||
break;
|
||||
case 0x338:
|
||||
tmpbyte |= 0x06;
|
||||
break;
|
||||
case 0x3e8:
|
||||
tmpbyte |= 0x07;
|
||||
break;
|
||||
default:
|
||||
tmpbyte |= 0x01; /* COM2 default */
|
||||
}
|
||||
IRDA_DEBUG(1, "COM_DEC (write): 0x%02x\n", tmpbyte);
|
||||
pci_write_config_byte(dev, COM_DEC, tmpbyte);
|
||||
|
||||
/* Enable LPC */
|
||||
pci_read_config_word(dev, LPC_EN, &tmpword); /* LPC_EN register */
|
||||
tmpword &= 0xfffd; /* mask bit 1 */
|
||||
tmpword |= 0x0001; /* set bit 0 : COMA addr range enable */
|
||||
/* Enable Low Pin Count interface */
|
||||
pci_read_config_word(dev, LPC_EN, &tmpword);
|
||||
/* These seem to be set up at all times,
|
||||
* just make sure it is properly set.
|
||||
*/
|
||||
switch(conf->cfg_base) {
|
||||
case 0x04e:
|
||||
tmpword |= 0x2000;
|
||||
break;
|
||||
case 0x02e:
|
||||
tmpword |= 0x1000;
|
||||
break;
|
||||
case 0x062:
|
||||
tmpword |= 0x0800;
|
||||
break;
|
||||
case 0x060:
|
||||
tmpword |= 0x0400;
|
||||
break;
|
||||
default:
|
||||
IRDA_WARNING("Uncommon I/O base address: 0x%04x\n",
|
||||
conf->cfg_base);
|
||||
break;
|
||||
}
|
||||
tmpword &= 0xfffd; /* disable LPC COMB */
|
||||
tmpword |= 0x0001; /* set bit 0 : enable LPC COMA addr range (GEN2) */
|
||||
IRDA_DEBUG(1, "LPC_EN (write): 0x%04x\n", tmpword);
|
||||
pci_write_config_word(dev, LPC_EN, tmpword);
|
||||
|
||||
/* Setup DMA */
|
||||
pci_write_config_word(dev, PCI_DMA_C, 0xc0c0); /* LPC I/F DMA on, channel 3 -- rtm (?? PCI DMA ?) */
|
||||
pci_write_config_word(dev, GEN2_DEC, 0x131); /* LPC I/F 2nd decode range */
|
||||
/*
|
||||
* Configure LPC DMA channel
|
||||
* PCI_DMA_C bits:
|
||||
* Bit 15-14: DMA channel 7 select
|
||||
* Bit 13-12: DMA channel 6 select
|
||||
* Bit 11-10: DMA channel 5 select
|
||||
* Bit 9-8: Reserved
|
||||
* Bit 7-6: DMA channel 3 select
|
||||
* Bit 5-4: DMA channel 2 select
|
||||
* Bit 3-2: DMA channel 1 select
|
||||
* Bit 1-0: DMA channel 0 select
|
||||
* 00 = Reserved value
|
||||
* 01 = PC/PCI DMA
|
||||
* 10 = Reserved value
|
||||
* 11 = LPC I/F DMA
|
||||
*/
|
||||
pci_read_config_word(dev, PCI_DMA_C, &tmpword);
|
||||
switch(conf->fir_dma) {
|
||||
case 0x07:
|
||||
tmpword |= 0xc000;
|
||||
break;
|
||||
case 0x06:
|
||||
tmpword |= 0x3000;
|
||||
break;
|
||||
case 0x05:
|
||||
tmpword |= 0x0c00;
|
||||
break;
|
||||
case 0x03:
|
||||
tmpword |= 0x00c0;
|
||||
break;
|
||||
case 0x02:
|
||||
tmpword |= 0x0030;
|
||||
break;
|
||||
case 0x01:
|
||||
tmpword |= 0x000c;
|
||||
break;
|
||||
case 0x00:
|
||||
tmpword |= 0x0003;
|
||||
break;
|
||||
default:
|
||||
break; /* do not change settings */
|
||||
}
|
||||
IRDA_DEBUG(1, "PCI_DMA_C (write): 0x%04x\n", tmpword);
|
||||
pci_write_config_word(dev, PCI_DMA_C, tmpword);
|
||||
|
||||
/*
|
||||
* GEN2_DEC bits:
|
||||
* Bit 15-4: Generic I/O range
|
||||
* Bit 3-1: reserved (read as 0)
|
||||
* Bit 0: enable GEN2 range on LPC I/F
|
||||
*/
|
||||
tmpword = conf->fir_io & 0xfff8;
|
||||
tmpword |= 0x0001;
|
||||
IRDA_DEBUG(1, "GEN2_DEC (write): 0x%04x\n", tmpword);
|
||||
pci_write_config_word(dev, GEN2_DEC, tmpword);
|
||||
|
||||
/* Pre-configure chip */
|
||||
ret = preconfigure_smsc_chip(conf);
|
||||
return preconfigure_smsc_chip(conf);
|
||||
}
|
||||
|
||||
/* Disable LPC */
|
||||
pci_read_config_word(dev, LPC_EN, &tmpword); /* LPC_EN register */
|
||||
tmpword &= 0xfffc; /* mask bit 1 and bit 0, COMA addr range disable */
|
||||
pci_write_config_word(dev, LPC_EN, tmpword);
|
||||
return ret;
|
||||
/*
|
||||
* Pre-configure a certain port on the ALi 1533 bridge.
|
||||
* This is based on reverse-engineering since ALi does not
|
||||
* provide any data sheet for the 1533 chip.
|
||||
*/
|
||||
static void __init preconfigure_ali_port(struct pci_dev *dev,
|
||||
unsigned short port)
|
||||
{
|
||||
unsigned char reg;
|
||||
/* These bits obviously control the different ports */
|
||||
unsigned char mask;
|
||||
unsigned char tmpbyte;
|
||||
|
||||
switch(port) {
|
||||
case 0x0130:
|
||||
case 0x0178:
|
||||
reg = 0xb0;
|
||||
mask = 0x80;
|
||||
break;
|
||||
case 0x03f8:
|
||||
reg = 0xb4;
|
||||
mask = 0x80;
|
||||
break;
|
||||
case 0x02f8:
|
||||
reg = 0xb4;
|
||||
mask = 0x30;
|
||||
break;
|
||||
case 0x02e8:
|
||||
reg = 0xb4;
|
||||
mask = 0x08;
|
||||
break;
|
||||
default:
|
||||
IRDA_ERROR("Failed to configure unsupported port on ALi 1533 bridge: 0x%04x\n", port);
|
||||
return;
|
||||
}
|
||||
|
||||
pci_read_config_byte(dev, reg, &tmpbyte);
|
||||
/* Turn on the right bits */
|
||||
tmpbyte |= mask;
|
||||
pci_write_config_byte(dev, reg, tmpbyte);
|
||||
IRDA_MESSAGE("Activated ALi 1533 ISA bridge port 0x%04x.\n", port);
|
||||
return;
|
||||
}
|
||||
|
||||
static int __init preconfigure_through_ali(struct pci_dev *dev,
|
||||
struct smsc_ircc_subsystem_configuration *conf)
|
||||
struct
|
||||
smsc_ircc_subsystem_configuration
|
||||
*conf)
|
||||
{
|
||||
/* TODO: put in ALi 1533 configuration here. */
|
||||
IRDA_MESSAGE("SORRY: %s has an unsupported bridge controller (ALi): not pre-configured.\n", conf->name);
|
||||
return -ENODEV;
|
||||
/* Configure the two ports on the ALi 1533 */
|
||||
preconfigure_ali_port(dev, conf->sir_io);
|
||||
preconfigure_ali_port(dev, conf->fir_io);
|
||||
|
||||
/* Pre-configure chip */
|
||||
return preconfigure_smsc_chip(conf);
|
||||
}
|
||||
|
||||
static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
|
||||
@ -2552,9 +2756,10 @@ static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
|
||||
struct smsc_ircc_subsystem_configuration *conf;
|
||||
|
||||
/*
|
||||
* Cache the subsystem vendor/device: some manufacturers fail to set
|
||||
* this for all components, so we save it in case there is just
|
||||
* 0x0000 0x0000 on the device we want to check.
|
||||
* Cache the subsystem vendor/device:
|
||||
* some manufacturers fail to set this for all components,
|
||||
* so we save it in case there is just 0x0000 0x0000 on the
|
||||
* device we want to check.
|
||||
*/
|
||||
if (dev->subsystem_vendor != 0x0000U) {
|
||||
ss_vendor = dev->subsystem_vendor;
|
||||
@ -2564,13 +2769,20 @@ static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
|
||||
for( ; conf->subvendor; conf++) {
|
||||
if(conf->vendor == dev->vendor &&
|
||||
conf->device == dev->device &&
|
||||
conf->subvendor == ss_vendor && /* Sometimes these are cached values */
|
||||
(conf->subdevice == ss_device || conf->subdevice == 0xffff)) {
|
||||
struct smsc_ircc_subsystem_configuration tmpconf;
|
||||
conf->subvendor == ss_vendor &&
|
||||
/* Sometimes these are cached values */
|
||||
(conf->subdevice == ss_device ||
|
||||
conf->subdevice == 0xffff)) {
|
||||
struct smsc_ircc_subsystem_configuration
|
||||
tmpconf;
|
||||
|
||||
memcpy(&tmpconf, conf, sizeof(struct smsc_ircc_subsystem_configuration));
|
||||
memcpy(&tmpconf, conf,
|
||||
sizeof(struct smsc_ircc_subsystem_configuration));
|
||||
|
||||
/* Override the default values with anything passed in as parameter */
|
||||
/*
|
||||
* Override the default values with anything
|
||||
* passed in as parameter
|
||||
*/
|
||||
if (ircc_cfg != 0)
|
||||
tmpconf.cfg_base = ircc_cfg;
|
||||
if (ircc_fir != 0)
|
||||
|
@ -10,8 +10,6 @@
|
||||
extern struct neigh_table arp_tbl;
|
||||
|
||||
extern void arp_init(void);
|
||||
extern int arp_rcv(struct sk_buff *skb, struct net_device *dev,
|
||||
struct packet_type *pt, struct net_device *orig_dev);
|
||||
extern int arp_find(unsigned char *haddr, struct sk_buff *skb);
|
||||
extern int arp_ioctl(unsigned int cmd, void __user *arg);
|
||||
extern void arp_send(int type, int ptype, u32 dest_ip,
|
||||
|
@ -143,6 +143,11 @@ struct xfrm_state
|
||||
/* Replay detection state at the time we sent the last notification */
|
||||
struct xfrm_replay_state preplay;
|
||||
|
||||
/* internal flag that only holds state for delayed aevent at the
|
||||
* moment
|
||||
*/
|
||||
u32 xflags;
|
||||
|
||||
/* Replay detection notification settings */
|
||||
u32 replay_maxage;
|
||||
u32 replay_maxdiff;
|
||||
@ -168,6 +173,9 @@ struct xfrm_state
|
||||
void *data;
|
||||
};
|
||||
|
||||
/* xflags - make enum if more show up */
|
||||
#define XFRM_TIME_DEFER 1
|
||||
|
||||
enum {
|
||||
XFRM_STATE_VOID,
|
||||
XFRM_STATE_ACQ,
|
||||
|
462
net/atm/clip.c
462
net/atm/clip.c
@ -2,7 +2,6 @@
|
||||
|
||||
/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
|
||||
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/errno.h>
|
||||
@ -54,24 +53,24 @@ static struct net_device *clip_devs;
|
||||
static struct atm_vcc *atmarpd;
|
||||
static struct neigh_table clip_tbl;
|
||||
static struct timer_list idle_timer;
|
||||
static int start_timer = 1;
|
||||
|
||||
|
||||
static int to_atmarpd(enum atmarp_ctrl_type type,int itf,unsigned long ip)
|
||||
static int to_atmarpd(enum atmarp_ctrl_type type, int itf, unsigned long ip)
|
||||
{
|
||||
struct sock *sk;
|
||||
struct atmarp_ctrl *ctrl;
|
||||
struct sk_buff *skb;
|
||||
|
||||
DPRINTK("to_atmarpd(%d)\n",type);
|
||||
if (!atmarpd) return -EUNATCH;
|
||||
DPRINTK("to_atmarpd(%d)\n", type);
|
||||
if (!atmarpd)
|
||||
return -EUNATCH;
|
||||
skb = alloc_skb(sizeof(struct atmarp_ctrl),GFP_ATOMIC);
|
||||
if (!skb) return -ENOMEM;
|
||||
if (!skb)
|
||||
return -ENOMEM;
|
||||
ctrl = (struct atmarp_ctrl *) skb_put(skb,sizeof(struct atmarp_ctrl));
|
||||
ctrl->type = type;
|
||||
ctrl->itf_num = itf;
|
||||
ctrl->ip = ip;
|
||||
atm_force_charge(atmarpd,skb->truesize);
|
||||
atm_force_charge(atmarpd, skb->truesize);
|
||||
|
||||
sk = sk_atm(atmarpd);
|
||||
skb_queue_tail(&sk->sk_receive_queue, skb);
|
||||
@ -79,26 +78,24 @@ static int to_atmarpd(enum atmarp_ctrl_type type,int itf,unsigned long ip)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void link_vcc(struct clip_vcc *clip_vcc,struct atmarp_entry *entry)
|
||||
static void link_vcc(struct clip_vcc *clip_vcc, struct atmarp_entry *entry)
|
||||
{
|
||||
DPRINTK("link_vcc %p to entry %p (neigh %p)\n",clip_vcc,entry,
|
||||
entry->neigh);
|
||||
DPRINTK("link_vcc %p to entry %p (neigh %p)\n", clip_vcc, entry,
|
||||
entry->neigh);
|
||||
clip_vcc->entry = entry;
|
||||
clip_vcc->xoff = 0; /* @@@ may overrun buffer by one packet */
|
||||
clip_vcc->xoff = 0; /* @@@ may overrun buffer by one packet */
|
||||
clip_vcc->next = entry->vccs;
|
||||
entry->vccs = clip_vcc;
|
||||
entry->neigh->used = jiffies;
|
||||
}
|
||||
|
||||
|
||||
static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
|
||||
{
|
||||
struct atmarp_entry *entry = clip_vcc->entry;
|
||||
struct clip_vcc **walk;
|
||||
|
||||
if (!entry) {
|
||||
printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n",clip_vcc);
|
||||
printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n", clip_vcc);
|
||||
return;
|
||||
}
|
||||
spin_lock_bh(&entry->neigh->dev->xmit_lock); /* block clip_start_xmit() */
|
||||
@ -107,24 +104,24 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
|
||||
if (*walk == clip_vcc) {
|
||||
int error;
|
||||
|
||||
*walk = clip_vcc->next; /* atomic */
|
||||
*walk = clip_vcc->next; /* atomic */
|
||||
clip_vcc->entry = NULL;
|
||||
if (clip_vcc->xoff)
|
||||
netif_wake_queue(entry->neigh->dev);
|
||||
if (entry->vccs)
|
||||
goto out;
|
||||
entry->expires = jiffies-1;
|
||||
/* force resolution or expiration */
|
||||
entry->expires = jiffies - 1;
|
||||
/* force resolution or expiration */
|
||||
error = neigh_update(entry->neigh, NULL, NUD_NONE,
|
||||
NEIGH_UPDATE_F_ADMIN);
|
||||
if (error)
|
||||
printk(KERN_CRIT "unlink_clip_vcc: "
|
||||
"neigh_update failed with %d\n",error);
|
||||
"neigh_update failed with %d\n", error);
|
||||
goto out;
|
||||
}
|
||||
printk(KERN_CRIT "ATMARP: unlink_clip_vcc failed (entry %p, vcc "
|
||||
"0x%p)\n",entry,clip_vcc);
|
||||
out:
|
||||
"0x%p)\n", entry, clip_vcc);
|
||||
out:
|
||||
spin_unlock_bh(&entry->neigh->dev->xmit_lock);
|
||||
}
|
||||
|
||||
@ -153,13 +150,13 @@ static int neigh_check_cb(struct neighbour *n)
|
||||
DPRINTK("destruction postponed with ref %d\n",
|
||||
atomic_read(&n->refcnt));
|
||||
|
||||
while ((skb = skb_dequeue(&n->arp_queue)) != NULL)
|
||||
while ((skb = skb_dequeue(&n->arp_queue)) != NULL)
|
||||
dev_kfree_skb(skb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
DPRINTK("expired neigh %p\n",n);
|
||||
DPRINTK("expired neigh %p\n", n);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -167,7 +164,7 @@ static void idle_timer_check(unsigned long dummy)
|
||||
{
|
||||
write_lock(&clip_tbl.lock);
|
||||
__neigh_for_each_release(&clip_tbl, neigh_check_cb);
|
||||
mod_timer(&idle_timer, jiffies+CLIP_CHECK_INTERVAL*HZ);
|
||||
mod_timer(&idle_timer, jiffies + CLIP_CHECK_INTERVAL * HZ);
|
||||
write_unlock(&clip_tbl.lock);
|
||||
}
|
||||
|
||||
@ -177,13 +174,13 @@ static int clip_arp_rcv(struct sk_buff *skb)
|
||||
|
||||
DPRINTK("clip_arp_rcv\n");
|
||||
vcc = ATM_SKB(skb)->vcc;
|
||||
if (!vcc || !atm_charge(vcc,skb->truesize)) {
|
||||
if (!vcc || !atm_charge(vcc, skb->truesize)) {
|
||||
dev_kfree_skb_any(skb);
|
||||
return 0;
|
||||
}
|
||||
DPRINTK("pushing to %p\n",vcc);
|
||||
DPRINTK("using %p\n",CLIP_VCC(vcc)->old_push);
|
||||
CLIP_VCC(vcc)->old_push(vcc,skb);
|
||||
DPRINTK("pushing to %p\n", vcc);
|
||||
DPRINTK("using %p\n", CLIP_VCC(vcc)->old_push);
|
||||
CLIP_VCC(vcc)->old_push(vcc, skb);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -193,34 +190,38 @@ static const unsigned char llc_oui[] = {
|
||||
0x03, /* Ctrl: Unnumbered Information Command PDU */
|
||||
0x00, /* OUI: EtherType */
|
||||
0x00,
|
||||
0x00 };
|
||||
0x00
|
||||
};
|
||||
|
||||
static void clip_push(struct atm_vcc *vcc,struct sk_buff *skb)
|
||||
static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
|
||||
{
|
||||
struct clip_vcc *clip_vcc = CLIP_VCC(vcc);
|
||||
|
||||
DPRINTK("clip push\n");
|
||||
if (!skb) {
|
||||
DPRINTK("removing VCC %p\n",clip_vcc);
|
||||
if (clip_vcc->entry) unlink_clip_vcc(clip_vcc);
|
||||
clip_vcc->old_push(vcc,NULL); /* pass on the bad news */
|
||||
DPRINTK("removing VCC %p\n", clip_vcc);
|
||||
if (clip_vcc->entry)
|
||||
unlink_clip_vcc(clip_vcc);
|
||||
clip_vcc->old_push(vcc, NULL); /* pass on the bad news */
|
||||
kfree(clip_vcc);
|
||||
return;
|
||||
}
|
||||
atm_return(vcc,skb->truesize);
|
||||
atm_return(vcc, skb->truesize);
|
||||
skb->dev = clip_vcc->entry ? clip_vcc->entry->neigh->dev : clip_devs;
|
||||
/* clip_vcc->entry == NULL if we don't have an IP address yet */
|
||||
/* clip_vcc->entry == NULL if we don't have an IP address yet */
|
||||
if (!skb->dev) {
|
||||
dev_kfree_skb_any(skb);
|
||||
return;
|
||||
}
|
||||
ATM_SKB(skb)->vcc = vcc;
|
||||
skb->mac.raw = skb->data;
|
||||
if (!clip_vcc->encap || skb->len < RFC1483LLC_LEN || memcmp(skb->data,
|
||||
llc_oui,sizeof(llc_oui))) skb->protocol = htons(ETH_P_IP);
|
||||
if (!clip_vcc->encap
|
||||
|| skb->len < RFC1483LLC_LEN
|
||||
|| memcmp(skb->data, llc_oui, sizeof (llc_oui)))
|
||||
skb->protocol = htons(ETH_P_IP);
|
||||
else {
|
||||
skb->protocol = ((u16 *) skb->data)[3];
|
||||
skb_pull(skb,RFC1483LLC_LEN);
|
||||
skb_pull(skb, RFC1483LLC_LEN);
|
||||
if (skb->protocol == htons(ETH_P_ARP)) {
|
||||
PRIV(skb->dev)->stats.rx_packets++;
|
||||
PRIV(skb->dev)->stats.rx_bytes += skb->len;
|
||||
@ -235,58 +236,54 @@ static void clip_push(struct atm_vcc *vcc,struct sk_buff *skb)
|
||||
netif_rx(skb);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Note: these spinlocks _must_not_ block on non-SMP. The only goal is that
|
||||
* clip_pop is atomic with respect to the critical section in clip_start_xmit.
|
||||
*/
|
||||
|
||||
|
||||
static void clip_pop(struct atm_vcc *vcc,struct sk_buff *skb)
|
||||
static void clip_pop(struct atm_vcc *vcc, struct sk_buff *skb)
|
||||
{
|
||||
struct clip_vcc *clip_vcc = CLIP_VCC(vcc);
|
||||
struct net_device *dev = skb->dev;
|
||||
int old;
|
||||
unsigned long flags;
|
||||
|
||||
DPRINTK("clip_pop(vcc %p)\n",vcc);
|
||||
clip_vcc->old_pop(vcc,skb);
|
||||
DPRINTK("clip_pop(vcc %p)\n", vcc);
|
||||
clip_vcc->old_pop(vcc, skb);
|
||||
/* skb->dev == NULL in outbound ARP packets */
|
||||
if (!dev) return;
|
||||
spin_lock_irqsave(&PRIV(dev)->xoff_lock,flags);
|
||||
if (atm_may_send(vcc,0)) {
|
||||
old = xchg(&clip_vcc->xoff,0);
|
||||
if (old) netif_wake_queue(dev);
|
||||
if (!dev)
|
||||
return;
|
||||
spin_lock_irqsave(&PRIV(dev)->xoff_lock, flags);
|
||||
if (atm_may_send(vcc, 0)) {
|
||||
old = xchg(&clip_vcc->xoff, 0);
|
||||
if (old)
|
||||
netif_wake_queue(dev);
|
||||
}
|
||||
spin_unlock_irqrestore(&PRIV(dev)->xoff_lock,flags);
|
||||
spin_unlock_irqrestore(&PRIV(dev)->xoff_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
static void clip_neigh_destroy(struct neighbour *neigh)
|
||||
{
|
||||
DPRINTK("clip_neigh_destroy (neigh %p)\n",neigh);
|
||||
DPRINTK("clip_neigh_destroy (neigh %p)\n", neigh);
|
||||
if (NEIGH2ENTRY(neigh)->vccs)
|
||||
printk(KERN_CRIT "clip_neigh_destroy: vccs != NULL !!!\n");
|
||||
NEIGH2ENTRY(neigh)->vccs = (void *) 0xdeadbeef;
|
||||
}
|
||||
|
||||
|
||||
static void clip_neigh_solicit(struct neighbour *neigh,struct sk_buff *skb)
|
||||
static void clip_neigh_solicit(struct neighbour *neigh, struct sk_buff *skb)
|
||||
{
|
||||
DPRINTK("clip_neigh_solicit (neigh %p, skb %p)\n",neigh,skb);
|
||||
to_atmarpd(act_need,PRIV(neigh->dev)->number,NEIGH2ENTRY(neigh)->ip);
|
||||
DPRINTK("clip_neigh_solicit (neigh %p, skb %p)\n", neigh, skb);
|
||||
to_atmarpd(act_need, PRIV(neigh->dev)->number, NEIGH2ENTRY(neigh)->ip);
|
||||
}
|
||||
|
||||
|
||||
static void clip_neigh_error(struct neighbour *neigh,struct sk_buff *skb)
|
||||
static void clip_neigh_error(struct neighbour *neigh, struct sk_buff *skb)
|
||||
{
|
||||
#ifndef CONFIG_ATM_CLIP_NO_ICMP
|
||||
icmp_send(skb,ICMP_DEST_UNREACH,ICMP_HOST_UNREACH,0);
|
||||
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0);
|
||||
#endif
|
||||
kfree_skb(skb);
|
||||
}
|
||||
|
||||
|
||||
static struct neigh_ops clip_neigh_ops = {
|
||||
.family = AF_INET,
|
||||
.solicit = clip_neigh_solicit,
|
||||
@ -297,7 +294,6 @@ static struct neigh_ops clip_neigh_ops = {
|
||||
.queue_xmit = dev_queue_xmit,
|
||||
};
|
||||
|
||||
|
||||
static int clip_constructor(struct neighbour *neigh)
|
||||
{
|
||||
struct atmarp_entry *entry = NEIGH2ENTRY(neigh);
|
||||
@ -305,9 +301,10 @@ static int clip_constructor(struct neighbour *neigh)
|
||||
struct in_device *in_dev;
|
||||
struct neigh_parms *parms;
|
||||
|
||||
DPRINTK("clip_constructor (neigh %p, entry %p)\n",neigh,entry);
|
||||
DPRINTK("clip_constructor (neigh %p, entry %p)\n", neigh, entry);
|
||||
neigh->type = inet_addr_type(entry->ip);
|
||||
if (neigh->type != RTN_UNICAST) return -EINVAL;
|
||||
if (neigh->type != RTN_UNICAST)
|
||||
return -EINVAL;
|
||||
|
||||
rcu_read_lock();
|
||||
in_dev = __in_dev_get_rcu(dev);
|
||||
@ -326,13 +323,13 @@ static int clip_constructor(struct neighbour *neigh)
|
||||
neigh->ops->connected_output : neigh->ops->output;
|
||||
entry->neigh = neigh;
|
||||
entry->vccs = NULL;
|
||||
entry->expires = jiffies-1;
|
||||
entry->expires = jiffies - 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static u32 clip_hash(const void *pkey, const struct net_device *dev)
|
||||
{
|
||||
return jhash_2words(*(u32 *)pkey, dev->ifindex, clip_tbl.hash_rnd);
|
||||
return jhash_2words(*(u32 *) pkey, dev->ifindex, clip_tbl.hash_rnd);
|
||||
}
|
||||
|
||||
static struct neigh_table clip_tbl = {
|
||||
@ -366,7 +363,6 @@ static struct neigh_table clip_tbl = {
|
||||
.gc_thresh3 = 1024,
|
||||
};
|
||||
|
||||
|
||||
/* @@@ copy bh locking from arp.c -- need to bh-enable atm code before */
|
||||
|
||||
/*
|
||||
@ -376,15 +372,13 @@ static struct neigh_table clip_tbl = {
|
||||
* clip_setentry.
|
||||
*/
|
||||
|
||||
|
||||
static int clip_encap(struct atm_vcc *vcc,int mode)
|
||||
static int clip_encap(struct atm_vcc *vcc, int mode)
|
||||
{
|
||||
CLIP_VCC(vcc)->encap = mode;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int clip_start_xmit(struct sk_buff *skb,struct net_device *dev)
|
||||
static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct clip_priv *clip_priv = PRIV(dev);
|
||||
struct atmarp_entry *entry;
|
||||
@ -392,7 +386,7 @@ static int clip_start_xmit(struct sk_buff *skb,struct net_device *dev)
|
||||
int old;
|
||||
unsigned long flags;
|
||||
|
||||
DPRINTK("clip_start_xmit (skb %p)\n",skb);
|
||||
DPRINTK("clip_start_xmit (skb %p)\n", skb);
|
||||
if (!skb->dst) {
|
||||
printk(KERN_ERR "clip_start_xmit: skb->dst == NULL\n");
|
||||
dev_kfree_skb(skb);
|
||||
@ -401,9 +395,9 @@ static int clip_start_xmit(struct sk_buff *skb,struct net_device *dev)
|
||||
}
|
||||
if (!skb->dst->neighbour) {
|
||||
#if 0
|
||||
skb->dst->neighbour = clip_find_neighbour(skb->dst,1);
|
||||
skb->dst->neighbour = clip_find_neighbour(skb->dst, 1);
|
||||
if (!skb->dst->neighbour) {
|
||||
dev_kfree_skb(skb); /* lost that one */
|
||||
dev_kfree_skb(skb); /* lost that one */
|
||||
clip_priv->stats.tx_dropped++;
|
||||
return 0;
|
||||
}
|
||||
@ -417,73 +411,73 @@ static int clip_start_xmit(struct sk_buff *skb,struct net_device *dev)
|
||||
if (!entry->vccs) {
|
||||
if (time_after(jiffies, entry->expires)) {
|
||||
/* should be resolved */
|
||||
entry->expires = jiffies+ATMARP_RETRY_DELAY*HZ;
|
||||
to_atmarpd(act_need,PRIV(dev)->number,entry->ip);
|
||||
entry->expires = jiffies + ATMARP_RETRY_DELAY * HZ;
|
||||
to_atmarpd(act_need, PRIV(dev)->number, entry->ip);
|
||||
}
|
||||
if (entry->neigh->arp_queue.qlen < ATMARP_MAX_UNRES_PACKETS)
|
||||
skb_queue_tail(&entry->neigh->arp_queue,skb);
|
||||
skb_queue_tail(&entry->neigh->arp_queue, skb);
|
||||
else {
|
||||
dev_kfree_skb(skb);
|
||||
clip_priv->stats.tx_dropped++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
DPRINTK("neigh %p, vccs %p\n",entry,entry->vccs);
|
||||
DPRINTK("neigh %p, vccs %p\n", entry, entry->vccs);
|
||||
ATM_SKB(skb)->vcc = vcc = entry->vccs->vcc;
|
||||
DPRINTK("using neighbour %p, vcc %p\n",skb->dst->neighbour,vcc);
|
||||
DPRINTK("using neighbour %p, vcc %p\n", skb->dst->neighbour, vcc);
|
||||
if (entry->vccs->encap) {
|
||||
void *here;
|
||||
|
||||
here = skb_push(skb,RFC1483LLC_LEN);
|
||||
memcpy(here,llc_oui,sizeof(llc_oui));
|
||||
here = skb_push(skb, RFC1483LLC_LEN);
|
||||
memcpy(here, llc_oui, sizeof(llc_oui));
|
||||
((u16 *) here)[3] = skb->protocol;
|
||||
}
|
||||
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
|
||||
ATM_SKB(skb)->atm_options = vcc->atm_options;
|
||||
entry->vccs->last_use = jiffies;
|
||||
DPRINTK("atm_skb(%p)->vcc(%p)->dev(%p)\n",skb,vcc,vcc->dev);
|
||||
old = xchg(&entry->vccs->xoff,1); /* assume XOFF ... */
|
||||
DPRINTK("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, vcc, vcc->dev);
|
||||
old = xchg(&entry->vccs->xoff, 1); /* assume XOFF ... */
|
||||
if (old) {
|
||||
printk(KERN_WARNING "clip_start_xmit: XOFF->XOFF transition\n");
|
||||
return 0;
|
||||
}
|
||||
clip_priv->stats.tx_packets++;
|
||||
clip_priv->stats.tx_bytes += skb->len;
|
||||
(void) vcc->send(vcc,skb);
|
||||
if (atm_may_send(vcc,0)) {
|
||||
vcc->send(vcc, skb);
|
||||
if (atm_may_send(vcc, 0)) {
|
||||
entry->vccs->xoff = 0;
|
||||
return 0;
|
||||
}
|
||||
spin_lock_irqsave(&clip_priv->xoff_lock,flags);
|
||||
netif_stop_queue(dev); /* XOFF -> throttle immediately */
|
||||
spin_lock_irqsave(&clip_priv->xoff_lock, flags);
|
||||
netif_stop_queue(dev); /* XOFF -> throttle immediately */
|
||||
barrier();
|
||||
if (!entry->vccs->xoff)
|
||||
netif_start_queue(dev);
|
||||
/* Oh, we just raced with clip_pop. netif_start_queue should be
|
||||
good enough, because nothing should really be asleep because
|
||||
of the brief netif_stop_queue. If this isn't true or if it
|
||||
changes, use netif_wake_queue instead. */
|
||||
spin_unlock_irqrestore(&clip_priv->xoff_lock,flags);
|
||||
/* Oh, we just raced with clip_pop. netif_start_queue should be
|
||||
good enough, because nothing should really be asleep because
|
||||
of the brief netif_stop_queue. If this isn't true or if it
|
||||
changes, use netif_wake_queue instead. */
|
||||
spin_unlock_irqrestore(&clip_priv->xoff_lock, flags);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static struct net_device_stats *clip_get_stats(struct net_device *dev)
|
||||
{
|
||||
return &PRIV(dev)->stats;
|
||||
}
|
||||
|
||||
|
||||
static int clip_mkip(struct atm_vcc *vcc,int timeout)
|
||||
static int clip_mkip(struct atm_vcc *vcc, int timeout)
|
||||
{
|
||||
struct clip_vcc *clip_vcc;
|
||||
struct sk_buff_head copy;
|
||||
struct sk_buff *skb;
|
||||
|
||||
if (!vcc->push) return -EBADFD;
|
||||
clip_vcc = kmalloc(sizeof(struct clip_vcc),GFP_KERNEL);
|
||||
if (!clip_vcc) return -ENOMEM;
|
||||
DPRINTK("mkip clip_vcc %p vcc %p\n",clip_vcc,vcc);
|
||||
if (!vcc->push)
|
||||
return -EBADFD;
|
||||
clip_vcc = kmalloc(sizeof(struct clip_vcc), GFP_KERNEL);
|
||||
if (!clip_vcc)
|
||||
return -ENOMEM;
|
||||
DPRINTK("mkip clip_vcc %p vcc %p\n", clip_vcc, vcc);
|
||||
clip_vcc->vcc = vcc;
|
||||
vcc->user_back = clip_vcc;
|
||||
set_bit(ATM_VF_IS_CLIP, &vcc->flags);
|
||||
@ -491,7 +485,7 @@ static int clip_mkip(struct atm_vcc *vcc,int timeout)
|
||||
clip_vcc->xoff = 0;
|
||||
clip_vcc->encap = 1;
|
||||
clip_vcc->last_use = jiffies;
|
||||
clip_vcc->idle_timeout = timeout*HZ;
|
||||
clip_vcc->idle_timeout = timeout * HZ;
|
||||
clip_vcc->old_push = vcc->push;
|
||||
clip_vcc->old_pop = vcc->pop;
|
||||
vcc->push = clip_push;
|
||||
@ -501,27 +495,25 @@ static int clip_mkip(struct atm_vcc *vcc,int timeout)
|
||||
/* re-process everything received between connection setup and MKIP */
|
||||
while ((skb = skb_dequeue(©)) != NULL)
|
||||
if (!clip_devs) {
|
||||
atm_return(vcc,skb->truesize);
|
||||
atm_return(vcc, skb->truesize);
|
||||
kfree_skb(skb);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
unsigned int len = skb->len;
|
||||
|
||||
clip_push(vcc,skb);
|
||||
clip_push(vcc, skb);
|
||||
PRIV(skb->dev)->stats.rx_packets--;
|
||||
PRIV(skb->dev)->stats.rx_bytes -= len;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int clip_setentry(struct atm_vcc *vcc,u32 ip)
|
||||
static int clip_setentry(struct atm_vcc *vcc, u32 ip)
|
||||
{
|
||||
struct neighbour *neigh;
|
||||
struct atmarp_entry *entry;
|
||||
int error;
|
||||
struct clip_vcc *clip_vcc;
|
||||
struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip, .tos = 1 } } };
|
||||
struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip, .tos = 1}} };
|
||||
struct rtable *rt;
|
||||
|
||||
if (vcc->push != clip_push) {
|
||||
@ -538,28 +530,29 @@ static int clip_setentry(struct atm_vcc *vcc,u32 ip)
|
||||
unlink_clip_vcc(clip_vcc);
|
||||
return 0;
|
||||
}
|
||||
error = ip_route_output_key(&rt,&fl);
|
||||
if (error) return error;
|
||||
neigh = __neigh_lookup(&clip_tbl,&ip,rt->u.dst.dev,1);
|
||||
error = ip_route_output_key(&rt, &fl);
|
||||
if (error)
|
||||
return error;
|
||||
neigh = __neigh_lookup(&clip_tbl, &ip, rt->u.dst.dev, 1);
|
||||
ip_rt_put(rt);
|
||||
if (!neigh)
|
||||
return -ENOMEM;
|
||||
entry = NEIGH2ENTRY(neigh);
|
||||
if (entry != clip_vcc->entry) {
|
||||
if (!clip_vcc->entry) DPRINTK("setentry: add\n");
|
||||
if (!clip_vcc->entry)
|
||||
DPRINTK("setentry: add\n");
|
||||
else {
|
||||
DPRINTK("setentry: update\n");
|
||||
unlink_clip_vcc(clip_vcc);
|
||||
}
|
||||
link_vcc(clip_vcc,entry);
|
||||
link_vcc(clip_vcc, entry);
|
||||
}
|
||||
error = neigh_update(neigh, llc_oui, NUD_PERMANENT,
|
||||
NEIGH_UPDATE_F_OVERRIDE|NEIGH_UPDATE_F_ADMIN);
|
||||
error = neigh_update(neigh, llc_oui, NUD_PERMANENT,
|
||||
NEIGH_UPDATE_F_OVERRIDE | NEIGH_UPDATE_F_ADMIN);
|
||||
neigh_release(neigh);
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
static void clip_setup(struct net_device *dev)
|
||||
{
|
||||
dev->hard_start_xmit = clip_start_xmit;
|
||||
@ -568,15 +561,14 @@ static void clip_setup(struct net_device *dev)
|
||||
dev->type = ARPHRD_ATM;
|
||||
dev->hard_header_len = RFC1483LLC_LEN;
|
||||
dev->mtu = RFC1626_MTU;
|
||||
dev->tx_queue_len = 100; /* "normal" queue (packets) */
|
||||
/* When using a "real" qdisc, the qdisc determines the queue */
|
||||
/* length. tx_queue_len is only used for the default case, */
|
||||
/* without any more elaborate queuing. 100 is a reasonable */
|
||||
/* compromise between decent burst-tolerance and protection */
|
||||
/* against memory hogs. */
|
||||
dev->tx_queue_len = 100; /* "normal" queue (packets) */
|
||||
/* When using a "real" qdisc, the qdisc determines the queue */
|
||||
/* length. tx_queue_len is only used for the default case, */
|
||||
/* without any more elaborate queuing. 100 is a reasonable */
|
||||
/* compromise between decent burst-tolerance and protection */
|
||||
/* against memory hogs. */
|
||||
}
|
||||
|
||||
|
||||
static int clip_create(int number)
|
||||
{
|
||||
struct net_device *dev;
|
||||
@ -585,19 +577,19 @@ static int clip_create(int number)
|
||||
|
||||
if (number != -1) {
|
||||
for (dev = clip_devs; dev; dev = PRIV(dev)->next)
|
||||
if (PRIV(dev)->number == number) return -EEXIST;
|
||||
}
|
||||
else {
|
||||
if (PRIV(dev)->number == number)
|
||||
return -EEXIST;
|
||||
} else {
|
||||
number = 0;
|
||||
for (dev = clip_devs; dev; dev = PRIV(dev)->next)
|
||||
if (PRIV(dev)->number >= number)
|
||||
number = PRIV(dev)->number+1;
|
||||
number = PRIV(dev)->number + 1;
|
||||
}
|
||||
dev = alloc_netdev(sizeof(struct clip_priv), "", clip_setup);
|
||||
if (!dev)
|
||||
return -ENOMEM;
|
||||
clip_priv = PRIV(dev);
|
||||
sprintf(dev->name,"atm%d",number);
|
||||
sprintf(dev->name, "atm%d", number);
|
||||
spin_lock_init(&clip_priv->xoff_lock);
|
||||
clip_priv->number = number;
|
||||
error = register_netdev(dev);
|
||||
@ -607,53 +599,48 @@ static int clip_create(int number)
|
||||
}
|
||||
clip_priv->next = clip_devs;
|
||||
clip_devs = dev;
|
||||
DPRINTK("registered (net:%s)\n",dev->name);
|
||||
DPRINTK("registered (net:%s)\n", dev->name);
|
||||
return number;
|
||||
}
|
||||
|
||||
|
||||
static int clip_device_event(struct notifier_block *this,unsigned long event,
|
||||
void *dev)
|
||||
static int clip_device_event(struct notifier_block *this, unsigned long event,
|
||||
void *arg)
|
||||
{
|
||||
/* ignore non-CLIP devices */
|
||||
if (((struct net_device *) dev)->type != ARPHRD_ATM ||
|
||||
((struct net_device *) dev)->hard_start_xmit != clip_start_xmit)
|
||||
struct net_device *dev = arg;
|
||||
|
||||
if (event == NETDEV_UNREGISTER) {
|
||||
neigh_ifdown(&clip_tbl, dev);
|
||||
return NOTIFY_DONE;
|
||||
}
|
||||
|
||||
/* ignore non-CLIP devices */
|
||||
if (dev->type != ARPHRD_ATM || dev->hard_start_xmit != clip_start_xmit)
|
||||
return NOTIFY_DONE;
|
||||
|
||||
switch (event) {
|
||||
case NETDEV_UP:
|
||||
DPRINTK("clip_device_event NETDEV_UP\n");
|
||||
(void) to_atmarpd(act_up,PRIV(dev)->number,0);
|
||||
break;
|
||||
case NETDEV_GOING_DOWN:
|
||||
DPRINTK("clip_device_event NETDEV_DOWN\n");
|
||||
(void) to_atmarpd(act_down,PRIV(dev)->number,0);
|
||||
break;
|
||||
case NETDEV_CHANGE:
|
||||
case NETDEV_CHANGEMTU:
|
||||
DPRINTK("clip_device_event NETDEV_CHANGE*\n");
|
||||
(void) to_atmarpd(act_change,PRIV(dev)->number,0);
|
||||
break;
|
||||
case NETDEV_REBOOT:
|
||||
case NETDEV_REGISTER:
|
||||
case NETDEV_DOWN:
|
||||
DPRINTK("clip_device_event %ld\n",event);
|
||||
/* ignore */
|
||||
break;
|
||||
default:
|
||||
printk(KERN_WARNING "clip_device_event: unknown event "
|
||||
"%ld\n",event);
|
||||
break;
|
||||
case NETDEV_UP:
|
||||
DPRINTK("clip_device_event NETDEV_UP\n");
|
||||
to_atmarpd(act_up, PRIV(dev)->number, 0);
|
||||
break;
|
||||
case NETDEV_GOING_DOWN:
|
||||
DPRINTK("clip_device_event NETDEV_DOWN\n");
|
||||
to_atmarpd(act_down, PRIV(dev)->number, 0);
|
||||
break;
|
||||
case NETDEV_CHANGE:
|
||||
case NETDEV_CHANGEMTU:
|
||||
DPRINTK("clip_device_event NETDEV_CHANGE*\n");
|
||||
to_atmarpd(act_change, PRIV(dev)->number, 0);
|
||||
break;
|
||||
}
|
||||
return NOTIFY_DONE;
|
||||
}
|
||||
|
||||
|
||||
static int clip_inet_event(struct notifier_block *this,unsigned long event,
|
||||
void *ifa)
|
||||
static int clip_inet_event(struct notifier_block *this, unsigned long event,
|
||||
void *ifa)
|
||||
{
|
||||
struct in_device *in_dev;
|
||||
|
||||
in_dev = ((struct in_ifaddr *) ifa)->ifa_dev;
|
||||
in_dev = ((struct in_ifaddr *)ifa)->ifa_dev;
|
||||
if (!in_dev || !in_dev->dev) {
|
||||
printk(KERN_WARNING "clip_inet_event: no device\n");
|
||||
return NOTIFY_DONE;
|
||||
@ -662,23 +649,20 @@ static int clip_inet_event(struct notifier_block *this,unsigned long event,
|
||||
* Transitions are of the down-change-up type, so it's sufficient to
|
||||
* handle the change on up.
|
||||
*/
|
||||
if (event != NETDEV_UP) return NOTIFY_DONE;
|
||||
return clip_device_event(this,NETDEV_CHANGE,in_dev->dev);
|
||||
if (event != NETDEV_UP)
|
||||
return NOTIFY_DONE;
|
||||
return clip_device_event(this, NETDEV_CHANGE, in_dev->dev);
|
||||
}
|
||||
|
||||
|
||||
static struct notifier_block clip_dev_notifier = {
|
||||
clip_device_event,
|
||||
NULL,
|
||||
0
|
||||
.notifier_call = clip_device_event,
|
||||
};
|
||||
|
||||
|
||||
|
||||
static struct notifier_block clip_inet_notifier = {
|
||||
clip_inet_event,
|
||||
NULL,
|
||||
0
|
||||
.notifier_call = clip_inet_event,
|
||||
};
|
||||
|
||||
|
||||
@ -686,14 +670,12 @@ static struct notifier_block clip_inet_notifier = {
|
||||
static void atmarpd_close(struct atm_vcc *vcc)
|
||||
{
|
||||
DPRINTK("atmarpd_close\n");
|
||||
atmarpd = NULL; /* assumed to be atomic */
|
||||
barrier();
|
||||
unregister_inetaddr_notifier(&clip_inet_notifier);
|
||||
unregister_netdevice_notifier(&clip_dev_notifier);
|
||||
if (skb_peek(&sk_atm(vcc)->sk_receive_queue))
|
||||
printk(KERN_ERR "atmarpd_close: closing with requests "
|
||||
"pending\n");
|
||||
|
||||
rtnl_lock();
|
||||
atmarpd = NULL;
|
||||
skb_queue_purge(&sk_atm(vcc)->sk_receive_queue);
|
||||
rtnl_unlock();
|
||||
|
||||
DPRINTK("(done)\n");
|
||||
module_put(THIS_MODULE);
|
||||
}
|
||||
@ -714,14 +696,14 @@ static struct atm_dev atmarpd_dev = {
|
||||
|
||||
static int atm_init_atmarp(struct atm_vcc *vcc)
|
||||
{
|
||||
if (atmarpd) return -EADDRINUSE;
|
||||
if (start_timer) {
|
||||
start_timer = 0;
|
||||
init_timer(&idle_timer);
|
||||
idle_timer.expires = jiffies+CLIP_CHECK_INTERVAL*HZ;
|
||||
idle_timer.function = idle_timer_check;
|
||||
add_timer(&idle_timer);
|
||||
rtnl_lock();
|
||||
if (atmarpd) {
|
||||
rtnl_unlock();
|
||||
return -EADDRINUSE;
|
||||
}
|
||||
|
||||
mod_timer(&idle_timer, jiffies+CLIP_CHECK_INTERVAL*HZ);
|
||||
|
||||
atmarpd = vcc;
|
||||
set_bit(ATM_VF_META,&vcc->flags);
|
||||
set_bit(ATM_VF_READY,&vcc->flags);
|
||||
@ -731,10 +713,7 @@ static int atm_init_atmarp(struct atm_vcc *vcc)
|
||||
vcc->push = NULL;
|
||||
vcc->pop = NULL; /* crash */
|
||||
vcc->push_oam = NULL; /* crash */
|
||||
if (register_netdevice_notifier(&clip_dev_notifier))
|
||||
printk(KERN_ERR "register_netdevice_notifier failed\n");
|
||||
if (register_inetaddr_notifier(&clip_inet_notifier))
|
||||
printk(KERN_ERR "register_inetaddr_notifier failed\n");
|
||||
rtnl_unlock();
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -744,53 +723,53 @@ static int clip_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
||||
int err = 0;
|
||||
|
||||
switch (cmd) {
|
||||
case SIOCMKCLIP:
|
||||
case ATMARPD_CTRL:
|
||||
case ATMARP_MKIP:
|
||||
case ATMARP_SETENTRY:
|
||||
case ATMARP_ENCAP:
|
||||
if (!capable(CAP_NET_ADMIN))
|
||||
return -EPERM;
|
||||
break;
|
||||
default:
|
||||
return -ENOIOCTLCMD;
|
||||
case SIOCMKCLIP:
|
||||
case ATMARPD_CTRL:
|
||||
case ATMARP_MKIP:
|
||||
case ATMARP_SETENTRY:
|
||||
case ATMARP_ENCAP:
|
||||
if (!capable(CAP_NET_ADMIN))
|
||||
return -EPERM;
|
||||
break;
|
||||
default:
|
||||
return -ENOIOCTLCMD;
|
||||
}
|
||||
|
||||
switch (cmd) {
|
||||
case SIOCMKCLIP:
|
||||
err = clip_create(arg);
|
||||
break;
|
||||
case ATMARPD_CTRL:
|
||||
err = atm_init_atmarp(vcc);
|
||||
if (!err) {
|
||||
sock->state = SS_CONNECTED;
|
||||
__module_get(THIS_MODULE);
|
||||
}
|
||||
break;
|
||||
case ATMARP_MKIP:
|
||||
err = clip_mkip(vcc ,arg);
|
||||
break;
|
||||
case ATMARP_SETENTRY:
|
||||
err = clip_setentry(vcc, arg);
|
||||
break;
|
||||
case ATMARP_ENCAP:
|
||||
err = clip_encap(vcc, arg);
|
||||
break;
|
||||
case SIOCMKCLIP:
|
||||
err = clip_create(arg);
|
||||
break;
|
||||
case ATMARPD_CTRL:
|
||||
err = atm_init_atmarp(vcc);
|
||||
if (!err) {
|
||||
sock->state = SS_CONNECTED;
|
||||
__module_get(THIS_MODULE);
|
||||
}
|
||||
break;
|
||||
case ATMARP_MKIP:
|
||||
err = clip_mkip(vcc, arg);
|
||||
break;
|
||||
case ATMARP_SETENTRY:
|
||||
err = clip_setentry(vcc, arg);
|
||||
break;
|
||||
case ATMARP_ENCAP:
|
||||
err = clip_encap(vcc, arg);
|
||||
break;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
static struct atm_ioctl clip_ioctl_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
.ioctl = clip_ioctl,
|
||||
.owner = THIS_MODULE,
|
||||
.ioctl = clip_ioctl,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
|
||||
static void svc_addr(struct seq_file *seq, struct sockaddr_atmsvc *addr)
|
||||
{
|
||||
static int code[] = { 1,2,10,6,1,0 };
|
||||
static int e164[] = { 1,8,4,6,1,0 };
|
||||
static int code[] = { 1, 2, 10, 6, 1, 0 };
|
||||
static int e164[] = { 1, 8, 4, 6, 1, 0 };
|
||||
|
||||
if (*addr->sas_addr.pub) {
|
||||
seq_printf(seq, "%s", addr->sas_addr.pub);
|
||||
@ -809,7 +788,7 @@ static void svc_addr(struct seq_file *seq, struct sockaddr_atmsvc *addr)
|
||||
for (i = 0; fields[i]; i++) {
|
||||
for (j = fields[i]; j; j--)
|
||||
seq_printf(seq, "%02X", *prv++);
|
||||
if (fields[i+1])
|
||||
if (fields[i + 1])
|
||||
seq_putc(seq, '.');
|
||||
}
|
||||
}
|
||||
@ -828,8 +807,7 @@ static void atmarp_info(struct seq_file *seq, struct net_device *dev,
|
||||
svc = ((clip_vcc == SEQ_NO_VCC_TOKEN) ||
|
||||
(sk_atm(clip_vcc->vcc)->sk_family == AF_ATMSVC));
|
||||
|
||||
llc = ((clip_vcc == SEQ_NO_VCC_TOKEN) ||
|
||||
clip_vcc->encap);
|
||||
llc = ((clip_vcc == SEQ_NO_VCC_TOKEN) || clip_vcc->encap);
|
||||
|
||||
if (clip_vcc == SEQ_NO_VCC_TOKEN)
|
||||
exp = entry->neigh->used;
|
||||
@ -839,10 +817,7 @@ static void atmarp_info(struct seq_file *seq, struct net_device *dev,
|
||||
exp = (jiffies - exp) / HZ;
|
||||
|
||||
seq_printf(seq, "%-6s%-4s%-4s%5ld ",
|
||||
dev->name,
|
||||
svc ? "SVC" : "PVC",
|
||||
llc ? "LLC" : "NULL",
|
||||
exp);
|
||||
dev->name, svc ? "SVC" : "PVC", llc ? "LLC" : "NULL", exp);
|
||||
|
||||
off = scnprintf(buf, sizeof(buf) - 1, "%d.%d.%d.%d",
|
||||
NIPQUAD(entry->ip));
|
||||
@ -860,8 +835,7 @@ static void atmarp_info(struct seq_file *seq, struct net_device *dev,
|
||||
} else if (!svc) {
|
||||
seq_printf(seq, "%d.%d.%d\n",
|
||||
clip_vcc->vcc->dev->number,
|
||||
clip_vcc->vcc->vpi,
|
||||
clip_vcc->vcc->vci);
|
||||
clip_vcc->vcc->vpi, clip_vcc->vcc->vci);
|
||||
} else {
|
||||
svc_addr(seq, &clip_vcc->vcc->remote);
|
||||
seq_putc(seq, '\n');
|
||||
@ -894,7 +868,7 @@ static struct clip_vcc *clip_seq_next_vcc(struct atmarp_entry *e,
|
||||
}
|
||||
|
||||
static void *clip_seq_vcc_walk(struct clip_seq_state *state,
|
||||
struct atmarp_entry *e, loff_t *pos)
|
||||
struct atmarp_entry *e, loff_t * pos)
|
||||
{
|
||||
struct clip_vcc *vcc = state->vcc;
|
||||
|
||||
@ -911,24 +885,24 @@ static void *clip_seq_vcc_walk(struct clip_seq_state *state,
|
||||
|
||||
return vcc;
|
||||
}
|
||||
|
||||
|
||||
static void *clip_seq_sub_iter(struct neigh_seq_state *_state,
|
||||
struct neighbour *n, loff_t *pos)
|
||||
struct neighbour *n, loff_t * pos)
|
||||
{
|
||||
struct clip_seq_state *state = (struct clip_seq_state *) _state;
|
||||
struct clip_seq_state *state = (struct clip_seq_state *)_state;
|
||||
|
||||
return clip_seq_vcc_walk(state, NEIGH2ENTRY(n), pos);
|
||||
}
|
||||
|
||||
static void *clip_seq_start(struct seq_file *seq, loff_t *pos)
|
||||
static void *clip_seq_start(struct seq_file *seq, loff_t * pos)
|
||||
{
|
||||
return neigh_seq_start(seq, pos, &clip_tbl, NEIGH_SEQ_NEIGH_ONLY);
|
||||
}
|
||||
|
||||
static int clip_seq_show(struct seq_file *seq, void *v)
|
||||
{
|
||||
static char atm_arp_banner[] =
|
||||
"IPitf TypeEncp Idle IP address ATM address\n";
|
||||
static char atm_arp_banner[] =
|
||||
"IPitf TypeEncp Idle IP address ATM address\n";
|
||||
|
||||
if (v == SEQ_START_TOKEN) {
|
||||
seq_puts(seq, atm_arp_banner);
|
||||
@ -939,7 +913,7 @@ static int clip_seq_show(struct seq_file *seq, void *v)
|
||||
|
||||
atmarp_info(seq, n->dev, NEIGH2ENTRY(n), vcc);
|
||||
}
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct seq_operations arp_seq_ops = {
|
||||
@ -988,20 +962,19 @@ static struct file_operations arp_seq_fops = {
|
||||
|
||||
static int __init atm_clip_init(void)
|
||||
{
|
||||
struct proc_dir_entry *p;
|
||||
neigh_table_init(&clip_tbl);
|
||||
|
||||
clip_tbl_hook = &clip_tbl;
|
||||
register_atm_ioctl(&clip_ioctl_ops);
|
||||
register_netdevice_notifier(&clip_dev_notifier);
|
||||
register_inetaddr_notifier(&clip_inet_notifier);
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
{
|
||||
struct proc_dir_entry *p;
|
||||
setup_timer(&idle_timer, idle_timer_check, 0);
|
||||
|
||||
p = create_proc_entry("arp", S_IRUGO, atm_proc_root);
|
||||
if (p)
|
||||
p->proc_fops = &arp_seq_fops;
|
||||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1012,13 +985,15 @@ static void __exit atm_clip_exit(void)
|
||||
|
||||
remove_proc_entry("arp", atm_proc_root);
|
||||
|
||||
unregister_inetaddr_notifier(&clip_inet_notifier);
|
||||
unregister_netdevice_notifier(&clip_dev_notifier);
|
||||
|
||||
deregister_atm_ioctl(&clip_ioctl_ops);
|
||||
|
||||
/* First, stop the idle timer, so it stops banging
|
||||
* on the table.
|
||||
*/
|
||||
if (start_timer == 0)
|
||||
del_timer(&idle_timer);
|
||||
del_timer_sync(&idle_timer);
|
||||
|
||||
/* Next, purge the table, so that the device
|
||||
* unregister loop below does not hang due to
|
||||
@ -1042,5 +1017,6 @@ static void __exit atm_clip_exit(void)
|
||||
|
||||
module_init(atm_clip_init);
|
||||
module_exit(atm_clip_exit);
|
||||
|
||||
MODULE_AUTHOR("Werner Almesberger");
|
||||
MODULE_DESCRIPTION("Classical/IP over ATM interface");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
@ -928,7 +928,8 @@ static void parp_redo(struct sk_buff *skb)
|
||||
* Receive an arp request from the device layer.
|
||||
*/
|
||||
|
||||
int arp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
|
||||
static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
|
||||
struct packet_type *pt, struct net_device *orig_dev)
|
||||
{
|
||||
struct arphdr *arp;
|
||||
|
||||
@ -1417,7 +1418,6 @@ static int __init arp_proc_init(void)
|
||||
|
||||
EXPORT_SYMBOL(arp_broken_ops);
|
||||
EXPORT_SYMBOL(arp_find);
|
||||
EXPORT_SYMBOL(arp_rcv);
|
||||
EXPORT_SYMBOL(arp_create);
|
||||
EXPORT_SYMBOL(arp_xmit);
|
||||
EXPORT_SYMBOL(arp_send);
|
||||
|
@ -1556,7 +1556,6 @@ void __init devinet_init(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(devinet_ioctl);
|
||||
EXPORT_SYMBOL(in_dev_finish_destroy);
|
||||
EXPORT_SYMBOL(inet_select_addr);
|
||||
EXPORT_SYMBOL(inetdev_by_index);
|
||||
|
@ -666,4 +666,3 @@ void __init ip_fib_init(void)
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(inet_addr_type);
|
||||
EXPORT_SYMBOL(ip_rt_ioctl);
|
||||
|
@ -43,8 +43,6 @@ struct inet_bind_bucket *inet_bind_bucket_create(kmem_cache_t *cachep,
|
||||
return tb;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(inet_bind_bucket_create);
|
||||
|
||||
/*
|
||||
* Caller must hold hashbucket lock for this tb with local BH disabled
|
||||
*/
|
||||
@ -64,8 +62,6 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
|
||||
inet_csk(sk)->icsk_bind_hash = tb;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(inet_bind_hash);
|
||||
|
||||
/*
|
||||
* Get rid of any references to a local port held by the given sock.
|
||||
*/
|
||||
|
@ -904,7 +904,7 @@ int ip_append_data(struct sock *sk,
|
||||
* because we have no idea what fragment will be
|
||||
* the last.
|
||||
*/
|
||||
if (datalen == length)
|
||||
if (datalen == length + fraggap)
|
||||
alloclen += rt->u.dst.trailer_len;
|
||||
|
||||
if (transhdrlen) {
|
||||
|
@ -4559,7 +4559,6 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
|
||||
|
||||
EXPORT_SYMBOL(sysctl_tcp_ecn);
|
||||
EXPORT_SYMBOL(sysctl_tcp_reordering);
|
||||
EXPORT_SYMBOL(sysctl_tcp_abc);
|
||||
EXPORT_SYMBOL(tcp_parse_options);
|
||||
EXPORT_SYMBOL(tcp_rcv_established);
|
||||
EXPORT_SYMBOL(tcp_rcv_state_process);
|
||||
|
@ -1859,5 +1859,4 @@ EXPORT_SYMBOL(tcp_proc_unregister);
|
||||
#endif
|
||||
EXPORT_SYMBOL(sysctl_local_port_range);
|
||||
EXPORT_SYMBOL(sysctl_tcp_low_latency);
|
||||
EXPORT_SYMBOL(sysctl_tcp_tw_reuse);
|
||||
|
||||
|
@ -59,9 +59,6 @@ int sysctl_tcp_tso_win_divisor = 3;
|
||||
int sysctl_tcp_mtu_probing = 0;
|
||||
int sysctl_tcp_base_mss = 512;
|
||||
|
||||
EXPORT_SYMBOL(sysctl_tcp_mtu_probing);
|
||||
EXPORT_SYMBOL(sysctl_tcp_base_mss);
|
||||
|
||||
static void update_send_head(struct sock *sk, struct tcp_sock *tp,
|
||||
struct sk_buff *skb)
|
||||
{
|
||||
|
@ -805,16 +805,22 @@ void xfrm_replay_notify(struct xfrm_state *x, int event)
|
||||
case XFRM_REPLAY_UPDATE:
|
||||
if (x->replay_maxdiff &&
|
||||
(x->replay.seq - x->preplay.seq < x->replay_maxdiff) &&
|
||||
(x->replay.oseq - x->preplay.oseq < x->replay_maxdiff))
|
||||
return;
|
||||
(x->replay.oseq - x->preplay.oseq < x->replay_maxdiff)) {
|
||||
if (x->xflags & XFRM_TIME_DEFER)
|
||||
event = XFRM_REPLAY_TIMEOUT;
|
||||
else
|
||||
return;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case XFRM_REPLAY_TIMEOUT:
|
||||
if ((x->replay.seq == x->preplay.seq) &&
|
||||
(x->replay.bitmap == x->preplay.bitmap) &&
|
||||
(x->replay.oseq == x->preplay.oseq))
|
||||
(x->replay.oseq == x->preplay.oseq)) {
|
||||
x->xflags |= XFRM_TIME_DEFER;
|
||||
return;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
@ -825,8 +831,10 @@ void xfrm_replay_notify(struct xfrm_state *x, int event)
|
||||
km_state_notify(x, &c);
|
||||
|
||||
if (x->replay_maxage &&
|
||||
!mod_timer(&x->rtimer, jiffies + x->replay_maxage))
|
||||
!mod_timer(&x->rtimer, jiffies + x->replay_maxage)) {
|
||||
xfrm_state_hold(x);
|
||||
x->xflags &= ~XFRM_TIME_DEFER;
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(xfrm_replay_notify);
|
||||
|
||||
@ -836,10 +844,15 @@ static void xfrm_replay_timer_handler(unsigned long data)
|
||||
|
||||
spin_lock(&x->lock);
|
||||
|
||||
if (xfrm_aevent_is_on() && x->km.state == XFRM_STATE_VALID)
|
||||
xfrm_replay_notify(x, XFRM_REPLAY_TIMEOUT);
|
||||
if (x->km.state == XFRM_STATE_VALID) {
|
||||
if (xfrm_aevent_is_on())
|
||||
xfrm_replay_notify(x, XFRM_REPLAY_TIMEOUT);
|
||||
else
|
||||
x->xflags |= XFRM_TIME_DEFER;
|
||||
}
|
||||
|
||||
spin_unlock(&x->lock);
|
||||
xfrm_state_put(x);
|
||||
}
|
||||
|
||||
int xfrm_replay_check(struct xfrm_state *x, u32 seq)
|
||||
|
Loading…
Reference in New Issue
Block a user