📄 patch-2.4.34-pre3
字号:
typedef struct { __u16 next __attribute__ ((packed));- __u8 Req __attribute__ ((packed));- __u8 ReqId __attribute__ ((packed));- __u8 ReqCh __attribute__ ((packed));- __u8 Reserved1 __attribute__ ((packed));+ __u8 Req;+ __u8 ReqId;+ __u8 ReqCh;+ __u8 Reserved1; __u16 Reference __attribute__ ((packed));- __u8 Reserved[8] __attribute__ ((packed));+ __u8 Reserved[8]; eicon_PBUFFER XBuffer; } eicon_REQ; typedef struct { __u16 next __attribute__ ((packed));- __u8 Rc __attribute__ ((packed));- __u8 RcId __attribute__ ((packed));- __u8 RcCh __attribute__ ((packed));- __u8 Reserved1 __attribute__ ((packed));+ __u8 Rc;+ __u8 RcId;+ __u8 RcCh;+ __u8 Reserved1; __u16 Reference __attribute__ ((packed));- __u8 Reserved2[8] __attribute__ ((packed));+ __u8 Reserved2[8]; } eicon_RC; typedef struct { __u16 next __attribute__ ((packed));- __u8 Ind __attribute__ ((packed));- __u8 IndId __attribute__ ((packed));- __u8 IndCh __attribute__ ((packed));- __u8 MInd __attribute__ ((packed));+ __u8 Ind;+ __u8 IndId;+ __u8 IndCh;+ __u8 MInd; __u16 MLength __attribute__ ((packed)); __u16 Reference __attribute__ ((packed));- __u8 RNR __attribute__ ((packed));- __u8 Reserved __attribute__ ((packed));+ __u8 RNR;+ __u8 Reserved; __u32 Ack __attribute__ ((packed)); eicon_PBUFFER RBuffer; } eicon_IND;diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.cindex 01cf494..9c0607b 100644--- a/drivers/isdn/hisax/hfc_pci.c+++ b/drivers/isdn/hisax/hfc_pci.c@@ -1742,7 +1742,7 @@ #if CONFIG_PCI /* Allocate memory for FIFOS */ /* Because the HFC-PCI needs a 32K physical alignment, we */ /* need to allocate the double mem and align the address */- if (!((void *) cs->hw.hfcpci.share_start = kmalloc(65536, GFP_KERNEL))) {+ if (!(cs->hw.hfcpci.share_start = kmalloc(65536, GFP_KERNEL))) { printk(KERN_WARNING "HFC-PCI: Error allocating memory for FIFO!\n"); return 0; }diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.hindex a2432ca..1b57b71 100644--- a/drivers/isdn/hisax/hisax.h+++ b/drivers/isdn/hisax/hisax.h@@ -395,15 +395,15 @@ struct isar_hw { struct hdlc_stat_reg { #ifdef __BIG_ENDIAN- u_char fill __attribute__((packed));- u_char mode __attribute__((packed));- u_char xml __attribute__((packed));- u_char cmd __attribute__((packed));+ u_char fill;+ u_char mode;+ u_char xml;+ u_char cmd; #else- u_char cmd __attribute__((packed));- u_char xml __attribute__((packed));- u_char mode __attribute__((packed));- u_char fill __attribute__((packed));+ u_char cmd;+ u_char xml;+ u_char mode;+ u_char fill; #endif }; diff --git a/drivers/md/lvm-internal.h b/drivers/md/lvm-internal.hindex f95069e..aca8632 100644--- a/drivers/md/lvm-internal.h+++ b/drivers/md/lvm-internal.h@@ -45,7 +45,6 @@ extern int loadtime; extern const char *const lvm_name; -extern uint vg_count; extern vg_t *vg[]; extern struct file_operations lvm_chr_fops; diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.hindex 3ed4d66..998fe25 100644--- a/drivers/media/video/bttvp.h+++ b/drivers/media/video/bttvp.h@@ -58,7 +58,6 @@ #define vprintk if (bttv_verbose) print #define BTTV_MAX 16 extern unsigned int bttv_num; /* number of Bt848s in use */-extern struct bttv bttvs[BTTV_MAX]; #define UNSET -1U @@ -203,6 +202,8 @@ struct bttv { int shutdown; void (*audio_hook)(struct bttv *btv, struct video_audio *v, int set); };++extern struct bttv bttvs[BTTV_MAX]; #endif #define btwrite(dat,adr) writel((dat), (char *) (btv->bt848_mem+(adr)))diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.cindex 9621a90..42b6f54 100644--- a/drivers/media/video/videodev.c+++ b/drivers/media/video/videodev.c@@ -489,7 +489,18 @@ static void videodev_proc_destroy_dev (s #endif /* CONFIG_VIDEO_PROC_FS */ -extern struct file_operations video_fops;+static struct file_operations video_fops=+{+ owner: THIS_MODULE,+ llseek: no_llseek,+ read: video_read,+ write: video_write,+ ioctl: video_ioctl,+ mmap: video_mmap,+ open: video_open,+ release: video_release,+ poll: video_poll,+}; /** * video_register_device - register video4linux devices@@ -633,19 +644,6 @@ #endif } -static struct file_operations video_fops=-{- owner: THIS_MODULE,- llseek: no_llseek,- read: video_read,- write: video_write,- ioctl: video_ioctl,- mmap: video_mmap,- open: video_open,- release: video_release,- poll: video_poll,-};- /* * Initialise video for linux */diff --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.cindex f4280a1..9399d4e 100644--- a/drivers/mtd/devices/blkmtd.c+++ b/drivers/mtd/devices/blkmtd.c@@ -195,6 +195,7 @@ static int commit_pages(struct blkmtd_de int err = 0; iobuf->length = iobuf->nr_pages << PAGE_SHIFT;+ iobuf->offset = 0; /* all pages are aligned */ iobuf->locked = 1; if(iobuf->length) { int i;diff --git a/drivers/net/3c507.c b/drivers/net/3c507.cindex 4ae5078..4359a64 100644--- a/drivers/net/3c507.c+++ b/drivers/net/3c507.c@@ -306,6 +306,7 @@ static void el16_tx_timeout (struct net_ static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad); static void init_82586_mem(struct net_device *dev); static struct ethtool_ops netdev_ethtool_ops;+static void init_rx_bufs(struct net_device *); /* Check for a network adaptor of this type, and return '0' iff one exists.@@ -602,7 +603,6 @@ static void el16_interrupt(int irq, void } if ((status & 0x0070) != 0x0040 && netif_running(dev)) {- static void init_rx_bufs(struct net_device *); /* The Rx unit is not ready, it must be hung. Restart the receiver by initializing the rx buffers, and issuing an Rx start command. */ if (net_debug)diff --git a/drivers/net/acenic.c b/drivers/net/acenic.cindex e09a485..5ad93f4 100644--- a/drivers/net/acenic.c+++ b/drivers/net/acenic.c@@ -594,6 +594,7 @@ static struct net_device *root_dev; static int probed __initdata = 0; +static void ace_watchdog(struct net_device *dev); int __devinit acenic_probe (ACE_PROBE_ARG) {@@ -665,7 +666,6 @@ #if ACENIC_DO_VLAN dev->vlan_rx_kill_vid = ace_vlan_rx_kill_vid; #endif if (1) {- static void ace_watchdog(struct net_device *dev); dev->tx_timeout = &ace_watchdog; dev->watchdog_timeo = 5*HZ; }diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.cindex 77687bb..ae79284 100644--- a/drivers/net/arcnet/arcnet.c+++ b/drivers/net/arcnet/arcnet.c@@ -277,7 +277,7 @@ static void release_arcbuf(struct net_de BUGLVL(D_DURING) { BUGMSG(D_DURING, "release_arcbuf: freed #%d; buffer queue is now: ", bufnum);- for (i = lp->next_buf; i != lp->first_free_buf; i = ++i % 5)+ for (i = lp->next_buf; i != lp->first_free_buf; i = (i+1) % 5) BUGMSG2(D_DURING, "#%d ", lp->buf_queue[i]); BUGMSG2(D_DURING, "\n"); }@@ -310,7 +310,7 @@ static int get_arcbuf(struct net_device BUGLVL(D_DURING) { BUGMSG(D_DURING, "get_arcbuf: got #%d; buffer queue is now: ", buf);- for (i = lp->next_buf; i != lp->first_free_buf; i = ++i % 5)+ for (i = lp->next_buf; i != lp->first_free_buf; i = (i+1) % 5) BUGMSG2(D_DURING, "#%d ", lp->buf_queue[i]); BUGMSG2(D_DURING, "\n"); }diff --git a/drivers/net/arlan.c b/drivers/net/arlan.cindex 204e651..f61269a 100644--- a/drivers/net/arlan.c+++ b/drivers/net/arlan.c@@ -12,7 +12,7 @@ #if BITS_PER_LONG != 32 # error FIXME: this driver requires a 32-bit platform #endif -static const char *arlan_version = "C.Jennigs 97 & Elmer.Joandi@ut.ee Oct'98, http://www.ylenurme.ee/~elmer/655/";+const char *arlan_version = "C.Jennigs 97 & Elmer.Joandi@ut.ee Oct'98, http://www.ylenurme.ee/~elmer/655/"; struct net_device *arlan_device[MAX_ARLANS]; int last_arlan;diff --git a/drivers/net/arlan.h b/drivers/net/arlan.hindex f0c19ea..b80ea02 100644--- a/drivers/net/arlan.h+++ b/drivers/net/arlan.h@@ -47,7 +47,6 @@ #endif extern struct net_device *arlan_device[MAX_ARLANS]; extern int arlan_debug;-extern char * siteName; extern int arlan_entry_debug; extern int arlan_exit_debug; extern int testMemory;diff --git a/drivers/net/de4x5.c b/drivers/net/de4x5.cindex 955fc66..d119720 100644--- a/drivers/net/de4x5.c+++ b/drivers/net/de4x5.c@@ -5109,7 +5109,7 @@ mii_get_phy(struct net_device *dev) lp->useMII = TRUE; /* Search the MII address space for possible PHY devices */- for (n=0, lp->mii_cnt=0, i=1; !((i==1) && (n==1)); i=(++i)%DE4X5_MAX_MII) {+ for (n=0, lp->mii_cnt=0, i=1; !((i==1) && (n==1)); i=(i+1)%DE4X5_MAX_MII) { lp->phy[lp->active].addr = i; if (i==0) n++; /* Count cycles */ while (de4x5_reset_phy(dev)<0) udelay(100);/* Wait for reset */diff --git a/drivers/net/depca.c b/drivers/net/depca.cindex 3479e73..3b981d5 100644--- a/drivers/net/depca.c+++ b/drivers/net/depca.c@@ -1746,7 +1746,7 @@ static int load_packet(struct net_device /* set up the buffer descriptors */ len = (skb->len < ETH_ZLEN) ? ETH_ZLEN : skb->len;- for (i = entry; i != end; i = (++i) & lp->txRingMask) {+ for (i = entry; i != end; i = (i+1) & lp->txRingMask) { /* clean out flags */ writel(readl(&lp->tx_ring[i].base) & ~T_FLAGS, &lp->tx_ring[i].base); writew(0x0000, &lp->tx_ring[i].misc); /* clears other error flags */diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.cindex 76f26b6..2f76d9c 100644--- a/drivers/net/hamradio/baycom_epp.c+++ b/drivers/net/hamradio/baycom_epp.c@@ -60,8 +60,10 @@ #if defined(CONFIG_AX25) || defined(CONF #include <net/ax25.h> #endif /* CONFIG_AX25 || CONFIG_AX25_MODULE */ +static int my_errno;+#define errno my_errno #define __KERNEL_SYSCALLS__-#include <linux/unistd.h>+#include <asm/unistd.h> /* --------------------------------------------------------------------- */ @@ -370,8 +372,6 @@ static char eppconfig_path[256] = "/usr/ static char *envp[] = { "HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL }; -static int errno;- static int exec_eppfpga(void *b) { struct baycom_state *bc = (struct baycom_state *)b;@@ -478,14 +478,14 @@ #undef PKP */ #define ENCODEITERA(j) \-({ \+do { \ if (!(notbitstream & (0x1f0 << j))) \ goto stuff##j; \ encodeend##j: ; \-})+} while (0) #define ENCODEITERB(j) \-({ \+do { \ stuff##j: \ bitstream &= ~(0x100 << j); \ bitbuf = (bitbuf & (((2 << j) << numbit) - 1)) | \@@ -493,7 +493,7 @@ ({ numbit++; \ notbitstream = ~bitstream; \ goto encodeend##j; \-})+} while (0) static void encode_hdlc(struct baycom_state *bc)@@ -710,16 +710,16 @@ static void do_rxpacket(struct net_devic } #define DECODEITERA(j) \-({ \+do { \ if (!(notbitstream & (0x0fc << j))) /* flag or abort */ \ goto flgabrt##j; \ if ((bitstream & (0x1f8 << j)) == (0xf8 << j)) /* stuffed bit */ \ goto stuff##j; \ enditer##j: ; \-})+} while (0) #define DECODEITERB(j) \-({ \+do { \ flgabrt##j: \ if (!(notbitstream & (0x1fc << j))) { /* abort received */ \ state = 0; \@@ -738,7 +738,7 @@ ({ numbits--; \ bitbuf = (bitbuf & ((~0xff) << j)) | ((bitbuf & ~((~0xff) << j)) << 1); \ goto enditer##j; \-})+} while (0) static int receive(struct net_device *dev, int cnt) {diff --git a/drivers/net/hamradio/soundmodem/sm.h b/drivers/net/hamradio/soundmodem/sm.hindex 25c47f9..b1105c2 100644--- a/drivers/net/hamradio/soundmodem/sm.h+++ b/drivers/net/hamradio/soundmodem/sm.h@@ -151,7 +151,6 @@ struct hardware_info { /* --------------------------------------------------------------------- */ extern const char sm_drvname[];-extern const char sm_drvinfo[]; /* --------------------------------------------------------------------- */ /*⌨️ 快捷键说明
复制代码
Ctrl + C
搜索代码
Ctrl + F
全屏模式
F11
切换主题
Ctrl + Shift + D
显示快捷键
?
增大字号
Ctrl + =
减小字号
Ctrl + -