Skip to content

Commit

Permalink
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Browse files Browse the repository at this point in the history 
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [UDP]: Fix reversed logic in udp_get_port().
  [IPV6]: Dumb typo in generic csum_ipv6_magic()
  [SCTP]: make 2 functions static
  [SCTP]: Fix typo adaption -> adaptation as per the latest API draft.
  [SCTP]: Don't export include/linux/sctp.h to userspace.
  [TCP]: Fix ambiguity in the `before' relation.
  [ATM] drivers/atm/fore200e.c: Cleanups.
  [ATM]: Remove dead ATM_TNETA1570 option.
  NetLabel: correctly fill in unused CIPSOv4 level and category mappings
  NetLabel: perform input validation earlier on CIPSOv4 DOI add ops
  • Loading branch information
Linus Torvalds committed Dec 22, 2006
2 parents 719d340 + 5c66870 commit f2a67a5
Show file tree
Hide file tree
Showing 18 changed files with 188 additions and 212 deletions.
4 changes: 0 additions & 4 deletions drivers/atm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,6 @@ config ATM_ZATM_DEBUG
Note that extended debugging may create certain race conditions
itself. Enable this ONLY if you suspect problems with the driver.

# bool 'Rolfs TI TNETA1570' CONFIG_ATM_TNETA1570 y
# if [ "$CONFIG_ATM_TNETA1570" = "y" ]; then
# bool ' Enable extended debugging' CONFIG_ATM_TNETA1570_DEBUG n
# fi
config ATM_NICSTAR
tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"
depends on PCI && ATM && !64BIT
Expand Down
166 changes: 68 additions & 98 deletions drivers/atm/fore200e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,25 +172,6 @@ fore200e_irq_itoa(int irq)
}


static void*
fore200e_kmalloc(int size, gfp_t flags)
{
void *chunk = kzalloc(size, flags);

if (!chunk)
printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n", size, flags);

return chunk;
}


static void
fore200e_kfree(void* chunk)
{
kfree(chunk);
}


/* allocate and align a chunk of memory intended to hold the data behing exchanged
between the driver and the adapter (using streaming DVMA) */

Expand All @@ -206,7 +187,7 @@ fore200e_chunk_alloc(struct fore200e* fore200e, struct chunk* chunk, int size, i
chunk->align_size = size;
chunk->direction = direction;

chunk->alloc_addr = fore200e_kmalloc(chunk->alloc_size, GFP_KERNEL | GFP_DMA);
chunk->alloc_addr = kzalloc(chunk->alloc_size, GFP_KERNEL | GFP_DMA);
if (chunk->alloc_addr == NULL)
return -ENOMEM;

Expand All @@ -228,7 +209,7 @@ fore200e_chunk_free(struct fore200e* fore200e, struct chunk* chunk)
{
fore200e->bus->dma_unmap(fore200e, chunk->dma_addr, chunk->dma_size, chunk->direction);

fore200e_kfree(chunk->alloc_addr);
kfree(chunk->alloc_addr);
}


Expand Down Expand Up @@ -882,7 +863,7 @@ fore200e_sba_detect(const struct fore200e_bus* bus, int index)
return NULL;
}

fore200e = fore200e_kmalloc(sizeof(struct fore200e), GFP_KERNEL);
fore200e = kzalloc(sizeof(struct fore200e), GFP_KERNEL);
if (fore200e == NULL)
return NULL;

Expand Down Expand Up @@ -1505,7 +1486,7 @@ fore200e_open(struct atm_vcc *vcc)

spin_unlock_irqrestore(&fore200e->q_lock, flags);

fore200e_vcc = fore200e_kmalloc(sizeof(struct fore200e_vcc), GFP_ATOMIC);
fore200e_vcc = kzalloc(sizeof(struct fore200e_vcc), GFP_ATOMIC);
if (fore200e_vcc == NULL) {
vc_map->vcc = NULL;
return -ENOMEM;
Expand All @@ -1526,7 +1507,7 @@ fore200e_open(struct atm_vcc *vcc)
if (fore200e->available_cell_rate < vcc->qos.txtp.max_pcr) {
up(&fore200e->rate_sf);

fore200e_kfree(fore200e_vcc);
kfree(fore200e_vcc);
vc_map->vcc = NULL;
return -EAGAIN;
}
Expand Down Expand Up @@ -1554,7 +1535,7 @@ fore200e_open(struct atm_vcc *vcc)

fore200e->available_cell_rate += vcc->qos.txtp.max_pcr;

fore200e_kfree(fore200e_vcc);
kfree(fore200e_vcc);
return -EINVAL;
}

Expand Down Expand Up @@ -1630,7 +1611,7 @@ fore200e_close(struct atm_vcc* vcc)
clear_bit(ATM_VF_PARTIAL,&vcc->flags);

ASSERT(fore200e_vcc);
fore200e_kfree(fore200e_vcc);
kfree(fore200e_vcc);
}


Expand Down Expand Up @@ -1831,7 +1812,7 @@ fore200e_getstats(struct fore200e* fore200e)
u32 stats_dma_addr;

if (fore200e->stats == NULL) {
fore200e->stats = fore200e_kmalloc(sizeof(struct stats), GFP_KERNEL | GFP_DMA);
fore200e->stats = kzalloc(sizeof(struct stats), GFP_KERNEL | GFP_DMA);
if (fore200e->stats == NULL)
return -ENOMEM;
}
Expand Down Expand Up @@ -2002,17 +1983,6 @@ fore200e_setloop(struct fore200e* fore200e, int loop_mode)
}


static inline unsigned int
fore200e_swap(unsigned int in)
{
#if defined(__LITTLE_ENDIAN)
return swab32(in);
#else
return in;
#endif
}


static int
fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
{
Expand All @@ -2021,19 +1991,19 @@ fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
if (fore200e_getstats(fore200e) < 0)
return -EIO;

tmp.section_bip = fore200e_swap(fore200e->stats->oc3.section_bip8_errors);
tmp.line_bip = fore200e_swap(fore200e->stats->oc3.line_bip24_errors);
tmp.path_bip = fore200e_swap(fore200e->stats->oc3.path_bip8_errors);
tmp.line_febe = fore200e_swap(fore200e->stats->oc3.line_febe_errors);
tmp.path_febe = fore200e_swap(fore200e->stats->oc3.path_febe_errors);
tmp.corr_hcs = fore200e_swap(fore200e->stats->oc3.corr_hcs_errors);
tmp.uncorr_hcs = fore200e_swap(fore200e->stats->oc3.ucorr_hcs_errors);
tmp.tx_cells = fore200e_swap(fore200e->stats->aal0.cells_transmitted) +
fore200e_swap(fore200e->stats->aal34.cells_transmitted) +
fore200e_swap(fore200e->stats->aal5.cells_transmitted);
tmp.rx_cells = fore200e_swap(fore200e->stats->aal0.cells_received) +
fore200e_swap(fore200e->stats->aal34.cells_received) +
fore200e_swap(fore200e->stats->aal5.cells_received);
tmp.section_bip = cpu_to_be32(fore200e->stats->oc3.section_bip8_errors);
tmp.line_bip = cpu_to_be32(fore200e->stats->oc3.line_bip24_errors);
tmp.path_bip = cpu_to_be32(fore200e->stats->oc3.path_bip8_errors);
tmp.line_febe = cpu_to_be32(fore200e->stats->oc3.line_febe_errors);
tmp.path_febe = cpu_to_be32(fore200e->stats->oc3.path_febe_errors);
tmp.corr_hcs = cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors);
tmp.uncorr_hcs = cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors);
tmp.tx_cells = cpu_to_be32(fore200e->stats->aal0.cells_transmitted) +
cpu_to_be32(fore200e->stats->aal34.cells_transmitted) +
cpu_to_be32(fore200e->stats->aal5.cells_transmitted);
tmp.rx_cells = cpu_to_be32(fore200e->stats->aal0.cells_received) +
cpu_to_be32(fore200e->stats->aal34.cells_received) +
cpu_to_be32(fore200e->stats->aal5.cells_received);

if (arg)
return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0;
Expand Down Expand Up @@ -2146,15 +2116,15 @@ fore200e_irq_request(struct fore200e* fore200e)
static int __devinit
fore200e_get_esi(struct fore200e* fore200e)
{
struct prom_data* prom = fore200e_kmalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
struct prom_data* prom = kzalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
int ok, i;

if (!prom)
return -ENOMEM;

ok = fore200e->bus->prom_read(fore200e, prom);
if (ok < 0) {
fore200e_kfree(prom);
kfree(prom);
return -EBUSY;
}

Expand All @@ -2169,7 +2139,7 @@ fore200e_get_esi(struct fore200e* fore200e)
fore200e->esi[ i ] = fore200e->atm_dev->esi[ i ] = prom->mac_addr[ i + 2 ];
}

fore200e_kfree(prom);
kfree(prom);

return 0;
}
Expand All @@ -2194,7 +2164,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e)
DPRINTK(2, "rx buffers %d / %d are being allocated\n", scheme, magn);

/* allocate the array of receive buffers */
buffer = bsq->buffer = fore200e_kmalloc(nbr * sizeof(struct buffer), GFP_KERNEL);
buffer = bsq->buffer = kzalloc(nbr * sizeof(struct buffer), GFP_KERNEL);

if (buffer == NULL)
return -ENOMEM;
Expand All @@ -2217,7 +2187,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e)

while (i > 0)
fore200e_chunk_free(fore200e, &buffer[ --i ].data);
fore200e_kfree(buffer);
kfree(buffer);

return -ENOMEM;
}
Expand Down Expand Up @@ -2736,7 +2706,7 @@ fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent
goto out;
}

fore200e = fore200e_kmalloc(sizeof(struct fore200e), GFP_KERNEL);
fore200e = kzalloc(sizeof(struct fore200e), GFP_KERNEL);
if (fore200e == NULL) {
err = -ENOMEM;
goto out_disable;
Expand Down Expand Up @@ -2999,8 +2969,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" 4b5b:\n"
" crc_header_errors:\t\t%10u\n"
" framing_errors:\t\t%10u\n",
fore200e_swap(fore200e->stats->phy.crc_header_errors),
fore200e_swap(fore200e->stats->phy.framing_errors));
cpu_to_be32(fore200e->stats->phy.crc_header_errors),
cpu_to_be32(fore200e->stats->phy.framing_errors));

if (!left--)
return sprintf(page, "\n"
Expand All @@ -3012,13 +2982,13 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" path_febe_errors:\t\t%10u\n"
" corr_hcs_errors:\t\t%10u\n"
" ucorr_hcs_errors:\t\t%10u\n",
fore200e_swap(fore200e->stats->oc3.section_bip8_errors),
fore200e_swap(fore200e->stats->oc3.path_bip8_errors),
fore200e_swap(fore200e->stats->oc3.line_bip24_errors),
fore200e_swap(fore200e->stats->oc3.line_febe_errors),
fore200e_swap(fore200e->stats->oc3.path_febe_errors),
fore200e_swap(fore200e->stats->oc3.corr_hcs_errors),
fore200e_swap(fore200e->stats->oc3.ucorr_hcs_errors));
cpu_to_be32(fore200e->stats->oc3.section_bip8_errors),
cpu_to_be32(fore200e->stats->oc3.path_bip8_errors),
cpu_to_be32(fore200e->stats->oc3.line_bip24_errors),
cpu_to_be32(fore200e->stats->oc3.line_febe_errors),
cpu_to_be32(fore200e->stats->oc3.path_febe_errors),
cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors),
cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3029,22 +2999,22 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" vpi no conn:\t\t%10u\n"
" vci out of range:\t\t%10u\n"
" vci no conn:\t\t%10u\n",
fore200e_swap(fore200e->stats->atm.cells_transmitted),
fore200e_swap(fore200e->stats->atm.cells_received),
fore200e_swap(fore200e->stats->atm.vpi_bad_range),
fore200e_swap(fore200e->stats->atm.vpi_no_conn),
fore200e_swap(fore200e->stats->atm.vci_bad_range),
fore200e_swap(fore200e->stats->atm.vci_no_conn));
cpu_to_be32(fore200e->stats->atm.cells_transmitted),
cpu_to_be32(fore200e->stats->atm.cells_received),
cpu_to_be32(fore200e->stats->atm.vpi_bad_range),
cpu_to_be32(fore200e->stats->atm.vpi_no_conn),
cpu_to_be32(fore200e->stats->atm.vci_bad_range),
cpu_to_be32(fore200e->stats->atm.vci_no_conn));

if (!left--)
return sprintf(page,"\n"
" AAL0:\t\t\t cells\n"
" TX:\t\t\t%10u\n"
" RX:\t\t\t%10u\n"
" dropped:\t\t\t%10u\n",
fore200e_swap(fore200e->stats->aal0.cells_transmitted),
fore200e_swap(fore200e->stats->aal0.cells_received),
fore200e_swap(fore200e->stats->aal0.cells_dropped));
cpu_to_be32(fore200e->stats->aal0.cells_transmitted),
cpu_to_be32(fore200e->stats->aal0.cells_received),
cpu_to_be32(fore200e->stats->aal0.cells_dropped));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3060,15 +3030,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" RX:\t\t\t%10u\n"
" dropped:\t\t\t%10u\n"
" protocol errors:\t\t%10u\n",
fore200e_swap(fore200e->stats->aal34.cells_transmitted),
fore200e_swap(fore200e->stats->aal34.cells_received),
fore200e_swap(fore200e->stats->aal34.cells_dropped),
fore200e_swap(fore200e->stats->aal34.cells_crc_errors),
fore200e_swap(fore200e->stats->aal34.cells_protocol_errors),
fore200e_swap(fore200e->stats->aal34.cspdus_transmitted),
fore200e_swap(fore200e->stats->aal34.cspdus_received),
fore200e_swap(fore200e->stats->aal34.cspdus_dropped),
fore200e_swap(fore200e->stats->aal34.cspdus_protocol_errors));
cpu_to_be32(fore200e->stats->aal34.cells_transmitted),
cpu_to_be32(fore200e->stats->aal34.cells_received),
cpu_to_be32(fore200e->stats->aal34.cells_dropped),
cpu_to_be32(fore200e->stats->aal34.cells_crc_errors),
cpu_to_be32(fore200e->stats->aal34.cells_protocol_errors),
cpu_to_be32(fore200e->stats->aal34.cspdus_transmitted),
cpu_to_be32(fore200e->stats->aal34.cspdus_received),
cpu_to_be32(fore200e->stats->aal34.cspdus_dropped),
cpu_to_be32(fore200e->stats->aal34.cspdus_protocol_errors));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3084,15 +3054,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" dropped:\t\t\t%10u\n"
" CRC errors:\t\t%10u\n"
" protocol errors:\t\t%10u\n",
fore200e_swap(fore200e->stats->aal5.cells_transmitted),
fore200e_swap(fore200e->stats->aal5.cells_received),
fore200e_swap(fore200e->stats->aal5.cells_dropped),
fore200e_swap(fore200e->stats->aal5.congestion_experienced),
fore200e_swap(fore200e->stats->aal5.cspdus_transmitted),
fore200e_swap(fore200e->stats->aal5.cspdus_received),
fore200e_swap(fore200e->stats->aal5.cspdus_dropped),
fore200e_swap(fore200e->stats->aal5.cspdus_crc_errors),
fore200e_swap(fore200e->stats->aal5.cspdus_protocol_errors));
cpu_to_be32(fore200e->stats->aal5.cells_transmitted),
cpu_to_be32(fore200e->stats->aal5.cells_received),
cpu_to_be32(fore200e->stats->aal5.cells_dropped),
cpu_to_be32(fore200e->stats->aal5.congestion_experienced),
cpu_to_be32(fore200e->stats->aal5.cspdus_transmitted),
cpu_to_be32(fore200e->stats->aal5.cspdus_received),
cpu_to_be32(fore200e->stats->aal5.cspdus_dropped),
cpu_to_be32(fore200e->stats->aal5.cspdus_crc_errors),
cpu_to_be32(fore200e->stats->aal5.cspdus_protocol_errors));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3103,11 +3073,11 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" large b2:\t\t\t%10u\n"
" RX PDUs:\t\t\t%10u\n"
" TX PDUs:\t\t\t%10lu\n",
fore200e_swap(fore200e->stats->aux.small_b1_failed),
fore200e_swap(fore200e->stats->aux.large_b1_failed),
fore200e_swap(fore200e->stats->aux.small_b2_failed),
fore200e_swap(fore200e->stats->aux.large_b2_failed),
fore200e_swap(fore200e->stats->aux.rpd_alloc_failed),
cpu_to_be32(fore200e->stats->aux.small_b1_failed),
cpu_to_be32(fore200e->stats->aux.large_b1_failed),
cpu_to_be32(fore200e->stats->aux.small_b2_failed),
cpu_to_be32(fore200e->stats->aux.large_b2_failed),
cpu_to_be32(fore200e->stats->aux.rpd_alloc_failed),
fore200e->tx_sat);

if (!left--)
Expand Down
1 change: 0 additions & 1 deletion include/linux/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ header-y += radeonfb.h
header-y += raw.h
header-y += resource.h
header-y += rose.h
header-y += sctp.h
header-y += smbno.h
header-y += snmp.h
header-y += sockios.h
Expand Down
10 changes: 5 additions & 5 deletions include/linux/sctp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ typedef enum {
SCTP_PARAM_ERR_CAUSE = __constant_htons(0xc003),
SCTP_PARAM_SET_PRIMARY = __constant_htons(0xc004),
SCTP_PARAM_SUCCESS_REPORT = __constant_htons(0xc005),
SCTP_PARAM_ADAPTION_LAYER_IND = __constant_htons(0xc006),
SCTP_PARAM_ADAPTATION_LAYER_IND = __constant_htons(0xc006),

} sctp_param_t; /* enum */

Expand Down Expand Up @@ -281,11 +281,11 @@ typedef struct sctp_ecn_capable_param {
sctp_paramhdr_t param_hdr;
} __attribute__((packed)) sctp_ecn_capable_param_t;

/* ADDIP Section 3.2.6 Adaption Layer Indication */
typedef struct sctp_adaption_ind_param {
/* ADDIP Section 3.2.6 Adaptation Layer Indication */
typedef struct sctp_adaptation_ind_param {
struct sctp_paramhdr param_hdr;
__be32 adaption_ind;
} __attribute__((packed)) sctp_adaption_ind_param_t;
__be32 adaptation_ind;
} __attribute__((packed)) sctp_adaptation_ind_param_t;

/* RFC 2960. Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):
* The INIT ACK chunk is used to acknowledge the initiation of an SCTP
Expand Down
2 changes: 1 addition & 1 deletion include/net/ip6_checksum.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
carry = (sum < uproto);
sum += carry;

return csum_fold((__force __wsum)csum);
return csum_fold((__force __wsum)sum);
}

#endif
Expand Down
2 changes: 0 additions & 2 deletions include/net/sctp/sctp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ extern int sctp_copy_local_addr_list(struct sctp_bind_addr *,
int flags);
extern struct sctp_pf *sctp_get_pf_specific(sa_family_t family);
extern int sctp_register_pf(struct sctp_pf *, sa_family_t);
int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
void *ptr);

/*
* sctp/socket.c
Expand Down
Loading

0 comments on commit f2a67a5

Please sign in to comment.