Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

3 files changed, 12 insertions, 9 deletions

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 08c674957af8..e7a711f53a6f 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -828,7 +828,6 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
 {
         struct fwnet_device *dev;
         struct fw_iso_packet packet;
-        struct fw_card *card;
         __be16 *hdr_ptr;
         __be32 *buf_ptr;
         int retval;
@@ -840,7 +839,6 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
         unsigned long flags;
 
         dev = data;
-        card = dev->card;
         hdr_ptr = header;
         length = be16_to_cpup(hdr_ptr);
 
@@ -861,8 +859,8 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
         if (specifier_id == IANA_SPECIFIER_ID && ver == RFC2734_SW_VERSION) {
                 buf_ptr += 2;
                 length -= IEEE1394_GASP_HDR_SIZE;
-                fwnet_incoming_packet(dev, buf_ptr, length,
-                                      source_node_id, -1, true);
+                fwnet_incoming_packet(dev, buf_ptr, length, source_node_id,
+                                      context->card->generation, true);
         }
 
         packet.payload_length = dev->rcv_buffer_size;
@@ -958,7 +956,12 @@ static void fwnet_transmit_packet_done(struct fwnet_packet_task *ptask)
                         break;
                 }
 
-                skb_pull(skb, ptask->max_payload);
+                if (ptask->dest_node == IEEE1394_ALL_NODES) {
+                        skb_pull(skb,
+                                 ptask->max_payload + IEEE1394_GASP_HDR_SIZE);
+                } else {
+                        skb_pull(skb, ptask->max_payload);
+                }
                 if (ptask->outstanding_pkts > 1) {
                         fwnet_make_sf_hdr(&ptask->hdr, RFC2374_HDR_INTFRAG,
                                           dg_size, fg_off, datagram_label);
@@ -1062,7 +1065,7 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
                 smp_rmb();
                 node_id = dev->card->node_id;
 
-                p = skb_push(ptask->skb, 8);
+                p = skb_push(ptask->skb, IEEE1394_GASP_HDR_SIZE);
                 put_unaligned_be32(node_id << 16 | IANA_SPECIFIER_ID >> 8, p);
                 put_unaligned_be32((IANA_SPECIFIER_ID & 0xff) << 24
                                                 | RFC2734_SW_VERSION, &p[4]);
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c
index 4ebfb2273672..76b2d390f6ec 100644
--- a/drivers/firewire/nosy.c
+++ b/drivers/firewire/nosy.c
@@ -529,7 +529,7 @@ remove_card(struct pci_dev *dev)
 
 #define RCV_BUFFER_SIZE (16 * 1024)
 
-static int __devinit
+static int
 add_card(struct pci_dev *dev, const struct pci_device_id *unused)
 {
         struct pcilynx *lynx;
@@ -683,7 +683,7 @@ fail_disable:
         return ret;
 }
 
-static struct pci_device_id pci_table[] __devinitdata = {
+static struct pci_device_id pci_table[] = {
         {
                 .vendor =    PCI_VENDOR_ID_TI,
                 .device =    PCI_DEVICE_ID_TI_PCILYNX,
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 638eea51376b..45912e6e0ac2 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -3537,7 +3537,7 @@ static inline void pmac_ohci_on(struct pci_dev *dev) {}
 static inline void pmac_ohci_off(struct pci_dev *dev) {}
 #endif /* CONFIG_PPC_PMAC */
 
-static int __devinit pci_probe(struct pci_dev *dev,
+static int pci_probe(struct pci_dev *dev,
                                const struct pci_device_id *ent)
 {
         struct fw_ohci *ohci;