projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 08aa9d92 | 1 | --- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100 |
| 2 | +++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100 | |
| 3 | @@ -15,7 +15,8 @@ | |
| 4 | #include <stdio.h> | |
| 5 | #include <ctype.h> | |
| 6 | #include "modpost.h" | |
| 7 | -#include "../../include/generated/autoconf.h" | |
| 8 | +// PLD architectures don't use CONFIG_SYMBOL_PREFIX | |
| 9 | +//#include "../../include/generated/autoconf.h" | |
| 10 | #include "../../include/linux/license.h" | |
| 11 | ||
| 12 | /* Some toolchains use a `_' prefix for all user symbols. */ | |
| 13 | ||
| 2136e199 AM |
14 | --- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200 |
| 15 | +++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200 | |
| 16 | @@ -9,6 +9,12 @@ | |
| 17 | $cc -print-file-name=lib${lib}.${ext} | grep -q / | |
| 18 | if [ $? -eq 0 ]; then | |
| 19 | echo "-l${lib}" | |
| 20 | + for libt in tinfow tinfo ; do | |
| 21 | + $cc -print-file-name=lib${libt}.${ext} | grep -q / | |
| 22 | + if [ $? -eq 0 ]; then | |
| 23 | + echo "-l${libt}" | |
| 24 | + fi | |
| 25 | + done | |
| 26 | exit | |
| 27 | fi | |
| 28 | done | |
| 44c0f99c | 29 | |
| 59e60efc AM |
30 | diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c |
| 31 | index 7a0c800..ec5ebbb 100644 | |
| 32 | --- a/drivers/net/ethernet/realtek/r8169.c | |
| 33 | +++ b/drivers/net/ethernet/realtek/r8169.c | |
| 514e5dae | 34 | @@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const |
| 59e60efc AM |
35 | for (i = 0; i < ETH_ALEN; i++) |
| 36 | dev->dev_addr[i] = RTL_R8(MAC0 + i); | |
| 514e5dae | 37 | |
| 59e60efc AM |
38 | + if (!is_valid_ether_addr(dev->dev_addr)) { |
| 39 | + /* Report it and use a random ethernet address instead */ | |
| 40 | + netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr); | |
| 41 | + random_ether_addr(dev->dev_addr); | |
| 42 | + netdev_info(dev, "Using random MAC address: %pM\n", | |
| 514e5dae | 43 | + dev->dev_addr); |
| 59e60efc | 44 | + } |
| 514e5dae | 45 | + |
| 59e60efc | 46 | SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops); |
| 514e5dae AM |
47 | dev->watchdog_timeo = RTL8169_TX_TIMEOUT; |
| 48 | ||
| 20e3bfd4 KK |
49 | [PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set |
| 50 | ||
| 51 | If a device has the skip_vpd_pages flag set we should simply fail the | |
| 52 | scsi_get_vpd_page() call. | |
| 53 | ||
| 54 | Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> | |
| 55 | Acked-by: Alan Stern <stern@rowland.harvard.edu> | |
| 56 | Tested-by: Stuart Foster <smf.linux@ntlworld.com> | |
| 57 | Cc: stable@vger.kernel.org | |
| 58 | ||
| 59 | diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c | |
| 60 | index 3b1ea34..eaa808e 100644 | |
| 61 | --- a/drivers/scsi/scsi.c | |
| 62 | +++ b/drivers/scsi/scsi.c | |
| 63 | @@ -1031,6 +1031,9 @@ | |
| 64 | { | |
| 65 | int i, result; | |
| 66 | ||
| 67 | + if (sdev->skip_vpd_pages) | |
| 68 | + goto fail; | |
| 69 | + | |
| 70 | /* Ask for all the pages supported by this device */ | |
| 71 | result = scsi_vpd_inquiry(sdev, buf, 0, buf_len); | |
| 72 | if (result) |